summaryrefslogtreecommitdiff
path: root/src/include/device/pci_ops.h
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-03-07 14:18:28 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-03-16 15:19:33 +0000
commit4663f45caa2352760ee08ec28b9c2d6e2e8823f9 (patch)
treecde34a0beabcd41ffbda765e7f9dd3d036bbe5cd /src/include/device/pci_ops.h
parent34cf5619f929775efd819468ba6036e637cfbd85 (diff)
device/pci_ops: Have only default PCI bus ops available
In the current state of the tree we do not utilise the mechanism of having per-device overrides for PCI bus ops. This change effectively inlines all PCI config accessors for ramstage as well. Change-Id: I11c37cadfcbef8fb5657dec6d620e6bccab311a4 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/31753 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/include/device/pci_ops.h')
-rw-r--r--src/include/device/pci_ops.h25
1 files changed, 6 insertions, 19 deletions
diff --git a/src/include/device/pci_ops.h b/src/include/device/pci_ops.h
index bb77754cb6..454795f519 100644
--- a/src/include/device/pci_ops.h
+++ b/src/include/device/pci_ops.h
@@ -39,13 +39,6 @@
#include <device/pci.h>
-const struct pci_bus_operations *pci_bus_default_ops(void);
-
-static __always_inline const struct pci_bus_operations *pci_bus_ops(void)
-{
- return pci_bus_default_ops();
-}
-
void __noreturn pcidev_die(void);
static __always_inline pci_devfn_t pcidev_bdf(const struct device *dev)
@@ -63,43 +56,37 @@ static __always_inline pci_devfn_t pcidev_assert(const struct device *dev)
static __always_inline
u8 pci_read_config8(const struct device *dev, u16 reg)
{
- pci_devfn_t bdf = PCI_BDF(dev);
- return pci_bus_ops()->read8(bdf, reg);
+ return pci_s_read_config8(PCI_BDF(dev), reg);
}
static __always_inline
u16 pci_read_config16(const struct device *dev, u16 reg)
{
- pci_devfn_t bdf = PCI_BDF(dev);
- return pci_bus_ops()->read16(bdf, reg);
+ return pci_s_read_config16(PCI_BDF(dev), reg);
}
static __always_inline
u32 pci_read_config32(const struct device *dev, u16 reg)
{
- pci_devfn_t bdf = PCI_BDF(dev);
- return pci_bus_ops()->read32(bdf, reg);
+ return pci_s_read_config32(PCI_BDF(dev), reg);
}
static __always_inline
void pci_write_config8(const struct device *dev, u16 reg, u8 val)
{
- pci_devfn_t bdf = PCI_BDF(dev);
- pci_bus_ops()->write8(bdf, reg, val);
+ pci_s_write_config8(PCI_BDF(dev), reg, val);
}
static __always_inline
void pci_write_config16(const struct device *dev, u16 reg, u16 val)
{
- pci_devfn_t bdf = PCI_BDF(dev);
- pci_bus_ops()->write16(bdf, reg, val);
+ pci_s_write_config16(PCI_BDF(dev), reg, val);
}
static __always_inline
void pci_write_config32(const struct device *dev, u16 reg, u32 val)
{
- pci_devfn_t bdf = PCI_BDF(dev);
- pci_bus_ops()->write32(bdf, reg, val);
+ pci_s_write_config32(PCI_BDF(dev), reg, val);
}
#endif