diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2024-01-09 16:56:56 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2024-01-11 14:41:40 +0000 |
| commit | 474c5d62145a49d6da3b53073ed67a156eb8bb68 (patch) | |
| tree | d3f985229ad7512577f9aa09562c46d2b7ce5699 /src | |
| parent | 4a65d65ab6c6c488e79424413323744b7af012d6 (diff) | |
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
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79862
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat (limited to 'src')
| -rw-r--r-- | src/soc/amd/common/block/acpi/ivrs.c | 1 | ||||
| -rw-r--r-- | src/soc/amd/common/block/acpi/madt.c | 2 | ||||
| -rw-r--r-- | src/soc/amd/common/block/include/amdblocks/data_fabric.h | 3 | ||||
| -rw-r--r-- | src/soc/amd/common/block/include/amdblocks/ioapic.h | 3 | ||||
| -rw-r--r-- | src/soc/amd/genoa_poc/domain.c | 1 | ||||
| -rw-r--r-- | src/soc/amd/genoa_poc/root_complex.c | 2 |
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 814f514eef..140968c673 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 14fab74b84..b502053c29 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 3a08a2011c..9dbf5dac35 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 bd1c363242..37f4b29992 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 8ed95abe34..f21cad5b3e 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 7dd1f821bc..849bf77a78 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> |