Attention is currently required from: Fred Reitberger, Jason Glenesk, Matt DeVillier.

Felix Held has uploaded this change for review.

View Change

soc/amd: move IOMMU_IOAPIC_IDX define to amdblocks/ioapic.h

Move the IOMMU_IOAPIC_IDX define from amdblocks/data_fabric.h to
amdblocks/ioapic.h which is both a more logical place for it to be and
this is also a preparation to use the common AMD MADT code for the
Stoneyridge SoC.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Iaa20e802cf5ed93f0d05842abb1aea0d43b1cac4
---
M src/soc/amd/common/block/acpi/ivrs.c
M src/soc/amd/common/block/acpi/madt.c
M src/soc/amd/common/block/include/amdblocks/data_fabric.h
M src/soc/amd/common/block/include/amdblocks/ioapic.h
M src/soc/amd/genoa_poc/domain.c
5 files changed, 5 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/62/79862/1

diff --git a/src/soc/amd/common/block/acpi/ivrs.c b/src/soc/amd/common/block/acpi/ivrs.c
index 814f514..140968c 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 14fab74b..b502053c 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 3a08a20..9dbf5da 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 bd1c363..37f4b29 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 8ed95ab..f21cad5 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>

To view, visit change 79862. To unsubscribe, or for help writing mail filters, visit settings.