Attention is currently required from: Arthur Heymans, Christian Walter, Johnny Lin, Lean Sheng Tan, Patrick Rudolph, Tim Chu.
Shuo Liu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/80629?usp=email )
Change subject: soc/intel/xeon_sp: Put SRAT util macros into Xeon-SP ACPI header ......................................................................
soc/intel/xeon_sp: Put SRAT util macros into Xeon-SP ACPI header
Macros MAX_ACPI_MEMORY_AFFINITY_COUNT and MAX_SRAT_MEM_ENTRIES_PER_IMC are ACPI table specific, and could be used across Xeon-SP SoCs. This patch moves their definition from FSP header to Xeon-SP layer ACPI header.
TEST=intel/archercity CRB
Signed-off-by: Shuo Liu shuo.liu@intel.com Change-Id: I6c3a84b04a452bc8d4217947a7d12f050c94b56b --- M src/soc/intel/xeon_sp/include/soc/acpi.h M src/vendorcode/intel/fsp/fsp2_0/sapphirerapids_sp/hob_memmap.h 2 files changed, 6 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/80629/1
diff --git a/src/soc/intel/xeon_sp/include/soc/acpi.h b/src/soc/intel/xeon_sp/include/soc/acpi.h index f9c55ab..c6d4f5a 100644 --- a/src/soc/intel/xeon_sp/include/soc/acpi.h +++ b/src/soc/intel/xeon_sp/include/soc/acpi.h @@ -26,4 +26,10 @@ unsigned long acpi_fill_hmat(unsigned long current); unsigned long cxl_fill_srat(unsigned long current);
+#define MAX_SRAT_MEM_ENTRIES_PER_IMC 8 + +#define MAX_ACPI_MEMORY_AFFINITY_COUNT ( \ + MAX_SOCKET * MAX_IMC * MAX_SRAT_MEM_ENTRIES_PER_IMC \ + ) + #endif /* _SOC_ACPI_H_ */ diff --git a/src/vendorcode/intel/fsp/fsp2_0/sapphirerapids_sp/hob_memmap.h b/src/vendorcode/intel/fsp/fsp2_0/sapphirerapids_sp/hob_memmap.h index 0cf1f86..040414b 100644 --- a/src/vendorcode/intel/fsp/fsp2_0/sapphirerapids_sp/hob_memmap.h +++ b/src/vendorcode/intel/fsp/fsp2_0/sapphirerapids_sp/hob_memmap.h @@ -40,11 +40,7 @@ }
#define MAX_IMC_PER_SOCKET MAX_IMC -#define MAX_SRAT_MEM_ENTRIES_PER_IMC 8 #define MAX_SMB_INSTANCE 2 -#define MAX_ACPI_MEMORY_AFFINITY_COUNT ( \ - MAX_SOCKET * MAX_IMC_PER_SOCKET * MAX_SRAT_MEM_ENTRIES_PER_IMC \ - ) #define AMT_MAX_NODE ((MAX_AMT)*(MAX_SOCKET)) // Max abstract memory target for all sockets
#endif // _HOB_MEMMAP_H_