4 files changed, 120 insertions, 37 deletions
diff --git a/payloads/libpayload/drivers/Makefile.inc b/payloads/libpayload/drivers/Makefile.inc
index 41fda5be1e..b2a91f6610 100644
--- a/payloads/libpayload/drivers/Makefile.inc
+++ b/payloads/libpayload/drivers/Makefile.inc
@@ -28,7 +28,13 @@
 ## SUCH DAMAGE.
 ##
 
-libc-$(CONFIG_LP_PCI) += pci.c
+libc-$(CONFIG_LP_PCI) += pci_ops.c
+
+ifeq ($(CONFIG_LP_PCI_IO_OPS),y)
+libc-$(CONFIG_LP_PCI) += pci_io_ops.c
+else
+libc-$(CONFIG_LP_PCI) += pci_map_bus_ops.c
+endif
 
 libc-$(CONFIG_LP_SPEAKER) += speaker.c
 
diff --git a/payloads/libpayload/drivers/pci_io_ops.c b/payloads/libpayload/drivers/pci_io_ops.c
new file mode 100644
index 0000000000..f6506a31ab
--- /dev/null
+++ b/payloads/libpayload/drivers/pci_io_ops.c
@@ -0,0 +1,67 @@
+/*
+ *
+ * Copyright (C) 2008 Advanced Micro Devices, Inc.
+ * Copyright (C) 2008 coresystems GmbH
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <libpayload.h>
+#include <pci.h>
+
+u8 pci_read_config8(pcidev_t dev, u16 reg)
+{
+	outl(dev | (reg & ~3), 0xCF8);
+	return inb(0xCFC + (reg & 3));
+}
+
+u16 pci_read_config16(pcidev_t dev, u16 reg)
+{
+	outl(dev | (reg & ~3), 0xCF8);
+	return inw(0xCFC + (reg & 3));
+}
+
+u32 pci_read_config32(pcidev_t dev, u16 reg)
+{
+	outl(dev | (reg & ~3), 0xCF8);
+	return inl(0xCFC + (reg & 3));
+}
+
+void pci_write_config8(pcidev_t dev, u16 reg, u8 val)
+{
+	outl(dev | (reg & ~3), 0xCF8);
+	outb(val, 0xCFC + (reg & 3));
+}
+
+void pci_write_config16(pcidev_t dev, u16 reg, u16 val)
+{
+	outl(dev | (reg & ~3), 0xCF8);
+	outw(val, 0xCFC + (reg & 3));
+}
+
+void pci_write_config32(pcidev_t dev, u16 reg, u32 val)
+{
+	outl(dev | (reg & ~3), 0xCF8);
+	outl(val, 0xCFC + (reg & 3));
+}
diff --git a/payloads/libpayload/drivers/pci_map_bus_ops.c b/payloads/libpayload/drivers/pci_map_bus_ops.c
new file mode 100644
index 0000000000..2b4f9d159a
--- /dev/null
+++ b/payloads/libpayload/drivers/pci_map_bus_ops.c
@@ -0,0 +1,46 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <libpayload.h>
+#include <pci.h>
+
+u8 pci_read_config8(pcidev_t dev, u16 reg)
+{
+	uintptr_t cfg_base = pci_map_bus(dev);
+
+	return read8((void *)(cfg_base | reg));
+}
+
+u16 pci_read_config16(pcidev_t dev, u16 reg)
+{
+	uintptr_t cfg_base = pci_map_bus(dev);
+
+	return read16((void *)(cfg_base | (reg & ~1)));
+}
+
+u32 pci_read_config32(pcidev_t dev, u16 reg)
+{
+	uintptr_t cfg_base = pci_map_bus(dev);
+
+	return read32((void *)(cfg_base | (reg & ~3)));
+}
+
+void pci_write_config8(pcidev_t dev, u16 reg, u8 val)
+{
+	uintptr_t cfg_base = pci_map_bus(dev);
+
+	write8((void *)(cfg_base | reg), val);
+}
+
+void pci_write_config16(pcidev_t dev, u16 reg, u16 val)
+{
+	uintptr_t cfg_base = pci_map_bus(dev);
+
+	write16((void *)(cfg_base | (reg & ~1)), val);
+}
+
+void pci_write_config32(pcidev_t dev, u16 reg, u32 val)
+{
+	uintptr_t cfg_base = pci_map_bus(dev);
+
+	write32((void *)(cfg_base | (reg & ~3)), val);
+}
diff --git a/payloads/libpayload/drivers/pci.c b/payloads/libpayload/drivers/pci_ops.c
index 90e9220d0a..79c3bc0781 100644
--- a/payloads/libpayload/drivers/pci.c
+++ b/payloads/libpayload/drivers/pci_ops.c
@@ -30,42 +30,6 @@
 #include <libpayload.h>
 #include <pci.h>
 
-u8 pci_read_config8(pcidev_t device, u16 reg)
-{
-	outl(device | (reg & ~3), 0xCF8);
-	return inb(0xCFC + (reg & 3));
-}
-
-u16 pci_read_config16(pcidev_t device, u16 reg)
-{
-	outl(device | (reg & ~3), 0xCF8);
-	return inw(0xCFC + (reg & 3));
-}
-
-u32 pci_read_config32(pcidev_t device, u16 reg)
-{
-	outl(device | (reg & ~3), 0xCF8);
-	return inl(0xCFC + (reg & 3));
-}
-
-void pci_write_config8(pcidev_t device, u16 reg, u8 val)
-{
-	outl(device | (reg & ~3), 0xCF8);
-	outb(val, 0xCFC + (reg & 3));
-}
-
-void pci_write_config16(pcidev_t device, u16 reg, u16 val)
-{
-	outl(device | (reg & ~3), 0xCF8);
-	outw(val, 0xCFC + (reg & 3));
-}
-
-void pci_write_config32(pcidev_t device, u16 reg, u32 val)
-{
-	outl(device | (reg & ~3), 0xCF8);
-	outl(val, 0xCFC + (reg & 3));
-}
-
 static int find_on_bus(int bus, unsigned short vid, unsigned short did,
 		       pcidev_t * dev)
 {