1 files changed, 22 insertions, 33 deletions
diff --git a/src/soc/amd/genoa_poc/root_complex.c b/src/soc/amd/genoa_poc/root_complex.c
index 849bf77a78..3171febe9f 100644
--- a/src/soc/amd/genoa_poc/root_complex.c
+++ b/src/soc/amd/genoa_poc/root_complex.c
@@ -2,26 +2,31 @@
 
 #include <amdblocks/ioapic.h>
 #include <amdblocks/root_complex.h>
-#include <console/console.h>
-#include <device/device.h>
 #include <types.h>
 
-uint32_t get_iohc_misc_smn_base(struct device *domain)
+static const struct domain_iohc_info iohc_info[] = {
+	[0] = {
+		.fabric_id = 0x22,
+		.misc_smn_base = SMN_IOHC_MISC_BASE_13C1,
+	},
+	[1] = {
+		.fabric_id = 0x23,
+		.misc_smn_base = SMN_IOHC_MISC_BASE_13B1,
+	},
+	[2] = {
+		.fabric_id = 0x21,
+		.misc_smn_base = SMN_IOHC_MISC_BASE_13E1,
+	},
+	[3] = {
+		.fabric_id = 0x20,
+		.misc_smn_base = SMN_IOHC_MISC_BASE_13D1,
+	},
+};
+
+const struct domain_iohc_info *get_iohc_info(size_t *count)
 {
-	switch (domain->path.domain.domain) {
-	case 0:
-		return SMN_IOHC_MISC_BASE_13C1;
-	case 1:
-		return SMN_IOHC_MISC_BASE_13B1;
-	case 2:
-		return SMN_IOHC_MISC_BASE_13E1;
-	case 3:
-		return SMN_IOHC_MISC_BASE_13D1;
-	default:
-		printk(BIOS_ERR, "Invalid domain 0x%x with no corresponding IOHC device.\n",
-		       domain->path.domain.domain);
-		return 0;
-	}
+	*count = ARRAY_SIZE(iohc_info);
+	return iohc_info;
 }
 
 static const struct non_pci_mmio_reg non_pci_mmio[] = {
@@ -44,19 +49,3 @@ const struct non_pci_mmio_reg *get_iohc_non_pci_mmio_regs(size_t *count)
 	*count = ARRAY_SIZE(non_pci_mmio);
 	return non_pci_mmio;
 }
-
-signed int get_iohc_fabric_id(struct device *domain)
-{
-	switch (domain->path.domain.domain) {
-	case 0:
-		return 0x22;
-	case 1:
-		return 0x23;
-	case 2:
-		return 0x21;
-	case 3:
-		return 0x20;
-	default:
-		return -1;
-	}
-}