diff options
| author | Nico Huber <nico.huber@secunet.com> | 2021-10-14 18:27:22 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2021-11-09 11:04:10 +0000 |
| commit | afe18986070ca6a755eda104624f0dd4756ae96a (patch) | |
| tree | 874ce852c6e48289be57e857a5ac988ae42f6540 | |
| parent | 91c077f6e244a05a32630024f068536209c26a02 (diff) | |
pci_mmio_cfg: Move guard around pci_s_* functions to x86
There is no platform in our tree that requires the PCI MMIO ops but
doesn't want the pci_s_* definitions. The only case where we include
the `pci_mmio_cfg.h` header but don't want the pci_s_* functions to
use MMIO is on older x86 platforms, so move the guard there.
Change-Id: Iaeed6ab43ad61b7c0e14572b12bf4ec06b6a26af
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58331
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Shelley Chen <shchen@google.com>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
| -rw-r--r-- | src/arch/x86/include/arch/pci_ops.h | 2 | ||||
| -rw-r--r-- | src/include/device/pci_mmio_cfg.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/arch/x86/include/arch/pci_ops.h b/src/arch/x86/include/arch/pci_ops.h index 317e597cff..abbd35c07d 100644 --- a/src/arch/x86/include/arch/pci_ops.h +++ b/src/arch/x86/include/arch/pci_ops.h @@ -4,6 +4,8 @@ #define ARCH_I386_PCI_OPS_H #include <arch/pci_io_cfg.h> +#if CONFIG(MMCONF_SUPPORT) #include <device/pci_mmio_cfg.h> +#endif #endif /* ARCH_I386_PCI_OPS_H */ diff --git a/src/include/device/pci_mmio_cfg.h b/src/include/device/pci_mmio_cfg.h index 8798405776..e873abc32c 100644 --- a/src/include/device/pci_mmio_cfg.h +++ b/src/include/device/pci_mmio_cfg.h @@ -105,6 +105,8 @@ uint32_t *pci_mmio_config32_addr(pci_devfn_t dev, uint16_t reg) #error "CONFIG_MMCONF_LENGTH does not correspond with CONFIG_MMCONF_BUS_NUMBER!" #endif +#endif + /* Avoid name collisions as different stages have different signature * for these functions. The _s_ stands for simple, fundamental IO or * MMIO variant. @@ -146,6 +148,4 @@ void pci_s_write_config32(pci_devfn_t dev, uint16_t reg, uint32_t value) pci_mmio_write_config32(dev, reg, value); } -#endif - #endif /* _PCI_MMIO_CFG_H */ |