summaryrefslogtreecommitdiffstats
path: root/src/soc/amd
diff options
context:
space:
mode:
Diffstat (limited to 'src/soc/amd')
-rw-r--r--src/soc/amd/common/block/acpi/ivrs.c1
-rw-r--r--src/soc/amd/common/block/acpi/madt.c2
-rw-r--r--src/soc/amd/common/block/include/amdblocks/data_fabric.h3
-rw-r--r--src/soc/amd/common/block/include/amdblocks/ioapic.h3
-rw-r--r--src/soc/amd/genoa_poc/domain.c1
-rw-r--r--src/soc/amd/genoa_poc/root_complex.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/soc/amd/common/block/acpi/ivrs.c b/src/soc/amd/common/block/acpi/ivrs.c
index 814f514eef2c..140968c673d3 100644
--- a/src/soc/amd/common/block/acpi/ivrs.c
+++ b/src/soc/amd/common/block/acpi/ivrs.c
@@ -3,7 +3,6 @@
#include <acpi/acpi_ivrs.h>
#include <amdblocks/acpi.h>
#include <amdblocks/cpu.h>
-#include <amdblocks/data_fabric.h>
#include <amdblocks/ioapic.h>
#include <amdblocks/iommu.h>
#include <arch/ioapic.h>
diff --git a/src/soc/amd/common/block/acpi/madt.c b/src/soc/amd/common/block/acpi/madt.c
index 14fab74b8492..b502053c29f6 100644
--- a/src/soc/amd/common/block/acpi/madt.c
+++ b/src/soc/amd/common/block/acpi/madt.c
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi.h>
-#include <amdblocks/data_fabric.h>
+#include <amdblocks/ioapic.h>
#include <device/device.h>
unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/soc/amd/common/block/include/amdblocks/data_fabric.h b/src/soc/amd/common/block/include/amdblocks/data_fabric.h
index 3a08a2011cc0..9dbf5dac350b 100644
--- a/src/soc/amd/common/block/include/amdblocks/data_fabric.h
+++ b/src/soc/amd/common/block/include/amdblocks/data_fabric.h
@@ -13,9 +13,6 @@
#define BROADCAST_FABRIC_ID 0xff
-/* Index of IOAPIC resource associated with IOMMU */
-#define IOMMU_IOAPIC_IDX 0x20000120
-
#define DF_MMIO_REG_OFFSET(instance) ((instance) * DF_MMIO_REG_SET_SIZE * sizeof(uint32_t))
/* The number of data fabric MMIO registers is SoC-specific */
diff --git a/src/soc/amd/common/block/include/amdblocks/ioapic.h b/src/soc/amd/common/block/include/amdblocks/ioapic.h
index bd1c3632421c..37f4b2999288 100644
--- a/src/soc/amd/common/block/include/amdblocks/ioapic.h
+++ b/src/soc/amd/common/block/include/amdblocks/ioapic.h
@@ -7,4 +7,7 @@
#define FCH_IOAPIC_ID 0
#define GNB_IOAPIC_ID 1
+/* Index of IOAPIC resource associated with IOMMU */
+#define IOMMU_IOAPIC_IDX 0x20000120
+
#endif /* AMD_BLOCK_IOAPIC_H */
diff --git a/src/soc/amd/genoa_poc/domain.c b/src/soc/amd/genoa_poc/domain.c
index 8ed95abe34c3..f21cad5b3e0b 100644
--- a/src/soc/amd/genoa_poc/domain.c
+++ b/src/soc/amd/genoa_poc/domain.c
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
+#include <amdblocks/ioapic.h>
#include <amdblocks/data_fabric.h>
#include <amdblocks/root_complex.h>
#include <amdblocks/smn.h>
diff --git a/src/soc/amd/genoa_poc/root_complex.c b/src/soc/amd/genoa_poc/root_complex.c
index 7dd1f821bc85..849bf77a7891 100644
--- a/src/soc/amd/genoa_poc/root_complex.c
+++ b/src/soc/amd/genoa_poc/root_complex.c
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#include <amdblocks/data_fabric.h>
+#include <amdblocks/ioapic.h>
#include <amdblocks/root_complex.h>
#include <console/console.h>
#include <device/device.h>