summaryrefslogtreecommitdiff
path: root/src/device
diff options
context:
space:
mode:
Diffstat (limited to 'src/device')
-rw-r--r--src/device/pci_ops_mmconf.c52
1 files changed, 7 insertions, 45 deletions
diff --git a/src/device/pci_ops_mmconf.c b/src/device/pci_ops_mmconf.c
index c7c005caa5..2fcb96174f 100644
--- a/src/device/pci_ops_mmconf.c
+++ b/src/device/pci_ops_mmconf.c
@@ -14,6 +14,7 @@
#include <device/mmio.h>
#include <device/pci.h>
#include <device/pci_ops.h>
+#include <device/pci_mmio_cfg.h>
#if (CONFIG_MMCONF_BASE_ADDRESS == 0)
#error "CONFIG_MMCONF_BASE_ADDRESS needs to be non-zero!"
@@ -23,52 +24,13 @@
* Functions for accessing PCI configuration space with mmconf accesses
*/
-#define PCI_MMIO_ADDR(dev, reg, mask) \
- ((void *)(((uintptr_t)CONFIG_MMCONF_BASE_ADDRESS |\
- (((dev)->bus->secondary & 0xFFF) << 20) |\
- (((dev)->path.pci.devfn & 0xFF) << 12) |\
- ((reg) & 0xFFF)) & ~mask))
-
-static uint8_t pci_mmconf_read_config8(const struct device *dev, uint16_t reg)
-{
- return read8(PCI_MMIO_ADDR(dev, reg, 0));
-}
-
-static uint16_t pci_mmconf_read_config16(const struct device *dev, uint16_t reg)
-{
- return read16(PCI_MMIO_ADDR(dev, reg, 1));
-}
-
-static uint32_t pci_mmconf_read_config32(const struct device *dev, uint16_t reg)
-{
- return read32(PCI_MMIO_ADDR(dev, reg, 3));
-}
-
-static void pci_mmconf_write_config8(const struct device *dev, uint16_t reg,
- uint8_t value)
-{
- write8(PCI_MMIO_ADDR(dev, reg, 0), value);
-}
-
-static void pci_mmconf_write_config16(const struct device *dev, uint16_t reg,
- uint16_t value)
-{
- write16(PCI_MMIO_ADDR(dev, reg, 1), value);
-}
-
-static void pci_mmconf_write_config32(const struct device *dev, uint16_t reg,
- uint32_t value)
-{
- write32(PCI_MMIO_ADDR(dev, reg, 3), value);
-}
-
static const struct pci_bus_operations pci_ops_mmconf = {
- .read8 = pci_mmconf_read_config8,
- .read16 = pci_mmconf_read_config16,
- .read32 = pci_mmconf_read_config32,
- .write8 = pci_mmconf_write_config8,
- .write16 = pci_mmconf_write_config16,
- .write32 = pci_mmconf_write_config32,
+ .read8 = pci_mmio_read_config8,
+ .read16 = pci_mmio_read_config16,
+ .read32 = pci_mmio_read_config32,
+ .write8 = pci_mmio_write_config8,
+ .write16 = pci_mmio_write_config16,
+ .write32 = pci_mmio_write_config32,
};
const struct pci_bus_operations *pci_bus_default_ops(void)