GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

device/pci_ops: Make PCI_BDF() available in all stages 

Caller needs to take into account that bus numbers may
have not been assigned yet. Same issue existed before
with early ramstage and mostly does not cause problems
when used with static devices on bus 0.

Change-Id: I4865b4277dbc858c8c2ffd2052defcaa1a92173c
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34614
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki 2019-07-29 16:38:14 +03:00 committed by Martin Roth
parent e825d3f4d6
commit 3f98d41b6e
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/device/pci_device.c
View File

@ -630,11 +630,6 @@ void pci_dev_enable_resources(struct device *dev)
pci_write_config16(dev, PCI_COMMAND, command); pci_write_config16(dev, PCI_COMMAND, command);
} }
void __noreturn pcidev_die(void)
{
die("PCI: dev is NULL!\n");
}
void pci_bus_enable_resources(struct device *dev) void pci_bus_enable_resources(struct device *dev)
{ {
u16 ctrl; u16 ctrl;

6
src/device/pci_ops.c
View File

@ -14,6 +14,7 @@
#define __SIMPLE_DEVICE__ #define __SIMPLE_DEVICE__
#include <stdint.h> #include <stdint.h>
#include <console/console.h>
#include <device/pci.h> #include <device/pci.h>
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
@ -85,3 +86,8 @@ u16 pci_s_find_capability(pci_devfn_t dev, u16 cap)
{ {
return pci_s_find_next_capability(dev, cap, 0); return pci_s_find_next_capability(dev, cap, 0);
} }
void __noreturn pcidev_die(void)
{
die("PCI: dev is NULL!\n");
}

32
src/include/device/pci_ops.h
View File

@ -23,22 +23,7 @@
#include <device/pci_type.h> #include <device/pci_type.h>
#include <arch/pci_ops.h> #include <arch/pci_ops.h>
#ifdef __SIMPLE_DEVICE__ #ifndef __ROMCC__
/* Avoid name collisions as different stages have different signature
* for these functions. The _s_ stands for simple, fundamental IO or
* MMIO variant.
*/
#define pci_read_config8 pci_s_read_config8
#define pci_read_config16 pci_s_read_config16
#define pci_read_config32 pci_s_read_config32
#define pci_write_config8 pci_s_write_config8
#define pci_write_config16 pci_s_write_config16
#define pci_write_config32 pci_s_write_config32
#else
#include <device/pci.h>
void __noreturn pcidev_die(void); void __noreturn pcidev_die(void);
static __always_inline pci_devfn_t pcidev_bdf(const struct device *dev) static __always_inline pci_devfn_t pcidev_bdf(const struct device *dev)
@ -52,6 +37,21 @@ static __always_inline pci_devfn_t pcidev_assert(const struct device *dev)
pcidev_die(); pcidev_die();
return pcidev_bdf(dev); return pcidev_bdf(dev);
} }
#endif
#ifdef __SIMPLE_DEVICE__
/* Avoid name collisions as different stages have different signature
* for these functions. The _s_ stands for simple, fundamental IO or
* MMIO variant.
*/
#define pci_read_config8 pci_s_read_config8
#define pci_read_config16 pci_s_read_config16
#define pci_read_config32 pci_s_read_config32
#define pci_write_config8 pci_s_write_config8
#define pci_write_config16 pci_s_write_config16
#define pci_write_config32 pci_s_write_config32
#else
static __always_inline static __always_inline
u8 pci_read_config8(const struct device *dev, u16 reg) u8 pci_read_config8(const struct device *dev, u16 reg)