commit 92b5296a7ba1d6368ea425d71bcbf804b0ec97c7
author Kyösti Mälkki <kyosti.malkki@gmail.com> Fri Mar 01 08:08:28 2019 +0200
committer Kyösti Mälkki <kyosti.malkki@gmail.com> Sun Mar 03 13:43:59 2019 +0000
tree 4fe55a9a0ab6e842676820d6685ed92091ef5c52
parent 268744306a512de20839fa566f847d33cfec03bc

device/pci_ops: Avoid name collisions

Having different signatures for the PCI config accessors
prevents them from having the same name in different
stages.

For now, work around this using __SIMPLE_DEVICE__.

Change-Id: I20f56cfe3ac7dc4421e62a99ca91f39a857c0ccf
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/31677
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>

src/include/device/pci_mmio_cfg.h

diff --git a/src/include/device/pci_mmio_cfg.h b/src/include/device/pci_mmio_cfg.h
index 0545001..d7ada4d 100644
--- a/src/include/device/pci_mmio_cfg.h
+++ b/src/include/device/pci_mmio_cfg.h
@@ -72,43 +72,46 @@
 
 #if IS_ENABLED(CONFIG_MMCONF_SUPPORT)
 
-#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.
+ */
+
 static __always_inline
-uint8_t pci_read_config8(pci_devfn_t dev, unsigned int where)
+uint8_t pci_s_read_config8(pci_devfn_t dev, unsigned int where)
 {
 	return pci_mmio_read_config8(dev, where);
 }
 
 static __always_inline
-uint16_t pci_read_config16(pci_devfn_t dev, unsigned int where)
+uint16_t pci_s_read_config16(pci_devfn_t dev, unsigned int where)
 {
 	return pci_mmio_read_config16(dev, where);
 }
 
 static __always_inline
-uint32_t pci_read_config32(pci_devfn_t dev, unsigned int where)
+uint32_t pci_s_read_config32(pci_devfn_t dev, unsigned int where)
 {
 	return pci_mmio_read_config32(dev, where);
 }
 
 static __always_inline
-void pci_write_config8(pci_devfn_t dev, unsigned int where, uint8_t value)
+void pci_s_write_config8(pci_devfn_t dev, unsigned int where, uint8_t value)
 {
 	pci_mmio_write_config8(dev, where, value);
 }
 
 static __always_inline
-void pci_write_config16(pci_devfn_t dev, unsigned int where, uint16_t value)
+void pci_s_write_config16(pci_devfn_t dev, unsigned int where, uint16_t value)
 {
 	pci_mmio_write_config16(dev, where, value);
 }
 
 static __always_inline
-void pci_write_config32(pci_devfn_t dev, unsigned int where, uint32_t value)
+void pci_s_write_config32(pci_devfn_t dev, unsigned int where, uint32_t value)
 {
 	pci_mmio_write_config32(dev, where, value);
 }
-#endif /* __SIMPLE_DEVICE__ */
 
 #endif