From 4663f45caa2352760ee08ec28b9c2d6e2e8823f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Thu, 7 Mar 2019 14:18:28 +0200 Subject: device/pci_ops: Have only default PCI bus ops available MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/31753 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber Reviewed-by: Aaron Durbin --- src/include/device/device.h | 1 - src/include/device/pci.h | 14 +------------- src/include/device/pci_ops.h | 25 ++++++------------------- 3 files changed, 7 insertions(+), 33 deletions(-) (limited to 'src/include') diff --git a/src/include/device/device.h b/src/include/device/device.h index 2e2cda9d94..7d7be732e8 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -17,7 +17,6 @@ struct device; struct pci_operations; -struct pci_bus_operations; struct i2c_bus_operations; struct smbus_bus_operations; struct pnp_mode_ops; diff --git a/src/include/device/pci.h b/src/include/device/pci.h index 14c4693459..f1de7bffa2 100644 --- a/src/include/device/pci.h +++ b/src/include/device/pci.h @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -33,19 +34,6 @@ struct pci_operations { void (*set_L1_ss_latency)(struct device *dev, unsigned int off); }; -/* Common pci bus operations */ -struct pci_bus_operations { - uint8_t (*read8)(pci_devfn_t dev, uint16_t reg); - uint16_t (*read16)(pci_devfn_t dev, uint16_t reg); - uint32_t (*read32)(pci_devfn_t dev, uint16_t reg); - void (*write8)(pci_devfn_t dev, uint16_t reg, uint8_t val); - void (*write16)(pci_devfn_t dev, uint16_t reg, uint16_t val); - void (*write32)(pci_devfn_t dev, uint16_t reg, uint32_t val); -}; - -// FIXME: Needs complete pci_bus_operations -#include - struct pci_driver { const struct device_operations *ops; unsigned short vendor; 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 -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 -- cgit v1.2.3