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

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>
This commit is contained in:
Kyösti Mälkki 2019-03-01 08:08:28 +02:00
parent 268744306a
commit 92b5296a7b
3 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/arch/x86/include/arch/pci_io_cfg.h
View File

@ -78,43 +78,48 @@ void pci_io_write_config32(pci_devfn_t dev, unsigned int where, uint32_t value)
} }
#if !IS_ENABLED(CONFIG_MMCONF_SUPPORT) #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 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_io_read_config8(dev, where); return pci_io_read_config8(dev, where);
} }
static __always_inline 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_io_read_config16(dev, where); return pci_io_read_config16(dev, where);
} }
static __always_inline 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_io_read_config32(dev, where); return pci_io_read_config32(dev, where);
} }
static __always_inline 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_io_write_config8(dev, where, value); pci_io_write_config8(dev, where, value);
} }
static __always_inline 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_io_write_config16(dev, where, value); pci_io_write_config16(dev, where, value);
} }
static __always_inline 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_io_write_config32(dev, where, value); pci_io_write_config32(dev, where, value);
} }
#endif /* __SIMPLE_DEVICE__ */
#endif #endif
#endif /* _PCI_IO_CFG_H */ #endif /* _PCI_IO_CFG_H */

19
src/include/device/pci_mmio_cfg.h
View File

@ -72,43 +72,46 @@ void pci_mmio_write_config32(pci_devfn_t dev, unsigned int where, u32 value)
#if IS_ENABLED(CONFIG_MMCONF_SUPPORT) #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 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); return pci_mmio_read_config8(dev, where);
} }
static __always_inline 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); return pci_mmio_read_config16(dev, where);
} }
static __always_inline 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); return pci_mmio_read_config32(dev, where);
} }
static __always_inline 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); pci_mmio_write_config8(dev, where, value);
} }
static __always_inline 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); pci_mmio_write_config16(dev, where, value);
} }
static __always_inline 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); pci_mmio_write_config32(dev, where, value);
} }
#endif /* __SIMPLE_DEVICE__ */
#endif #endif

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

@ -5,7 +5,19 @@
#include <device/device.h> #include <device/device.h>
#include <arch/pci_ops.h> #include <arch/pci_ops.h>
#ifndef __SIMPLE_DEVICE__ #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
u8 pci_read_config8(struct device *dev, unsigned int where); u8 pci_read_config8(struct device *dev, unsigned int where);
u16 pci_read_config16(struct device *dev, unsigned int where); u16 pci_read_config16(struct device *dev, unsigned int where);
u32 pci_read_config32(struct device *dev, unsigned int where); u32 pci_read_config32(struct device *dev, unsigned int where);