diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-01-23 16:02:28 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-02-11 11:31:50 +0000 |
| commit | 371f04811e075d79741d130e2043ec8e19044dde (patch) | |
| tree | f2f5f4e843c8f611aa9da2900459acb45372eab5 /src | |
| parent | 06ea8f9b9ac66860b35c9885cf37692edf447693 (diff) | |
device/pci: Always define PCI_DEV()
This has uses outside ARCH_x86 and/or __PRE_RAM__.
Change-Id: I2eec674ec5ba4ffe03a20db0f73cf87e5e4b4d0d
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/31302
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/x86/include/arch/io.h | 6 | ||||
| -rw-r--r-- | src/include/device/pci_type.h | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/arch/x86/include/arch/io.h b/src/arch/x86/include/arch/io.h index 1a27994ca7..71e3ba00ae 100644 --- a/src/arch/x86/include/arch/io.h +++ b/src/arch/x86/include/arch/io.h @@ -205,11 +205,6 @@ static __always_inline void write64(volatile void *addr, #ifdef __SIMPLE_DEVICE__ -#define PCI_DEV(SEGBUS, DEV, FN) ( \ - (((SEGBUS) & 0xFFF) << 20) | \ - (((DEV) & 0x1F) << 15) | \ - (((FN) & 0x07) << 12)) - #define PCI_ID(VENDOR_ID, DEVICE_ID) \ ((((DEVICE_ID) & 0xFFFF) << 16) | ((VENDOR_ID) & 0xFFFF)) @@ -273,7 +268,6 @@ void pci_write_config32(pci_devfn_t dev, unsigned int where, uint32_t value) pci_io_write_config32(dev, where, value); } -#define PCI_DEV_INVALID (0xffffffffU) static inline pci_devfn_t pci_io_locate_device(unsigned int pci_id, pci_devfn_t dev) { diff --git a/src/include/device/pci_type.h b/src/include/device/pci_type.h index 2849ececa7..0b08e8d0aa 100644 --- a/src/include/device/pci_type.h +++ b/src/include/device/pci_type.h @@ -19,4 +19,11 @@ typedef u32 pci_devfn_t; typedef u32 pnp_devfn_t; +#define PCI_DEV(SEGBUS, DEV, FN) ( \ + (((SEGBUS) & 0xFFF) << 20) | \ + (((DEV) & 0x1F) << 15) | \ + (((FN) & 0x07) << 12)) + +#define PCI_DEV_INVALID (0xffffffffU) + #endif /* DEVICE_PCI_TYPE_H */ |