diff --git a/src/device/Kconfig b/src/device/Kconfig
index bcff6fd8b0..af3fe80a59 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -558,12 +558,6 @@ config PCI
 	bool
 	default n
 
-config PCI_IOBASE
-	hex
-	help
-	  The memory address of a memory-mapped translator that lets the
-	  CPU communicate with peripheral devices over PCI I/O space.
-
 if PCI
 
 config DOMAIN_RESOURCE_32BIT_LIMIT
diff --git a/src/include/arch-generic/io.h b/src/include/arch-generic/io.h
index 5874fc8425..30f331ec99 100644
--- a/src/include/arch-generic/io.h
+++ b/src/include/arch-generic/io.h
@@ -19,7 +19,12 @@
 #include <endian.h>
 #include <arch/mmio.h>
 
-#define __io(a)	(void *)(uintptr_t)(CONFIG_PCI_IOBASE + a)
+/*
+ * The memory address of a memory-mapped translator that lets the
+ * CPU communicate with peripheral devices over PCI I/O space.
+ */
+extern uintptr_t io_port_mmio_base;
+#define __io(a) (void *)(io_port_mmio_base + a)
 
 static inline void outb(uint8_t value, uint16_t port)
 {
diff --git a/src/lib/Makefile.mk b/src/lib/Makefile.mk
index 84b982dbf6..e0bec03427 100644
--- a/src/lib/Makefile.mk
+++ b/src/lib/Makefile.mk
@@ -291,6 +291,10 @@ postcar-y += rmodule.c
 postcar-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
 postcar-$(CONFIG_GENERIC_UDELAY) += timer.c
 
+all-$(CONFIG_ARCH_ARM) += io.c
+all-$(CONFIG_ARCH_ARM64) += io.c
+all-$(CONFIG_ARCH_RISCV) += io.c
+
 # Use program.ld for all the platforms which use C fo the bootblock.
 bootblock-y += program.ld
 
diff --git a/src/lib/io.c b/src/lib/io.c
new file mode 100644
index 0000000000..a5808d6029
--- /dev/null
+++ b/src/lib/io.c
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <stdint.h>
+
+uintptr_t __weak io_port_mmio_base = 0;
diff --git a/src/mainboard/emulation/qemu-aarch64/Kconfig b/src/mainboard/emulation/qemu-aarch64/Kconfig
index 42f9110df4..c0f579e799 100644
--- a/src/mainboard/emulation/qemu-aarch64/Kconfig
+++ b/src/mainboard/emulation/qemu-aarch64/Kconfig
@@ -30,9 +30,6 @@ config ECAM_MMCONF_BASE_ADDRESS
 config ECAM_MMCONF_BUS_NUMBER
 	default 256
 
-config PCI_IOBASE
-	default 0x3eff0000
-
 config MEMLAYOUT_LD_FILE
 	string
 	default "src/mainboard/emulation/qemu-aarch64/memlayout.ld"
diff --git a/src/mainboard/emulation/qemu-aarch64/mmio.c b/src/mainboard/emulation/qemu-aarch64/mmio.c
index 0fac64d234..a1dca5a6dc 100644
--- a/src/mainboard/emulation/qemu-aarch64/mmio.c
+++ b/src/mainboard/emulation/qemu-aarch64/mmio.c
@@ -3,6 +3,8 @@
 #include <console/uart.h>
 #include <mainboard/addressmap.h>
 
+uintptr_t io_port_mmio_base = 0x3eff0000;
+
 uintptr_t uart_platform_base(unsigned int idx)
 {
 	return VIRT_UART_BASE;
diff --git a/src/soc/amd/common/psp_verstage/fch.c b/src/soc/amd/common/psp_verstage/fch.c
index 5e46e68b65..45ba2f7e25 100644
--- a/src/soc/amd/common/psp_verstage/fch.c
+++ b/src/soc/amd/common/psp_verstage/fch.c
@@ -48,21 +48,11 @@ static void gpio_set_bar(void *bar)
 	acpimmio_gpio0 = bar;
 }
 
-static uintptr_t io_bar;
+uintptr_t io_port_mmio_base;
 
 static void io_set_bar(void *bar)
 {
-	io_bar = (uintptr_t)bar;
-}
-
-u8 io_read8(u16 reg)
-{
-	return read8p(io_bar + reg);
-}
-
-void io_write8(u16 reg, u8 value)
-{
-	write8p(io_bar + reg, value);
+	io_port_mmio_base = (uintptr_t)bar;
 }
 
 static void aoac_set_bar(void *bar)
diff --git a/src/soc/amd/common/psp_verstage/include/arch/io.h b/src/soc/amd/common/psp_verstage/include/arch/io.h
deleted file mode 100644
index efa128b25c..0000000000
--- a/src/soc/amd/common/psp_verstage/include/arch/io.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef __ARCH_IO_H__
-#define __ARCH_IO_H__
-
-#include <stdint.h>
-
-u8 io_read8(u16 reg);
-void io_write8(u16 reg, u8 value);
-
-static inline void outb(uint8_t value, uint16_t port)
-{
-	io_write8(port, value);
-}
-
-static inline uint8_t inb(uint16_t port)
-{
-	return io_read8(port);
-}
-
-#endif