[coreboot-gerrit] [XS] Change in coreboot[main]: soc/intel/xeon_sp: Use ACPI common flags in SRAT generation

[Shuo Liu (Code Review)]

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/+/80630?usp=email )

Change subject: soc/intel/xeon_sp: Use ACPI common flags in SRAT generation
......................................................................

soc/intel/xeon_sp: Use ACPI common flags in SRAT generation

Move the definition of SRAT memory flags (SRAT_ACPI_MEMORY_ENABLED
and SRAT_ACPI_MEMORY_NONVOLATILE) from FSP header to ACPI common
codes.

TEST=intel/archercity CRB

Signed-off-by: Shuo Liu 
Change-Id: I6aa5c20c9556fd5d680406518d19a83801b0852c
---
M src/include/acpi/acpi.h
M src/soc/intel/xeon_sp/uncore_acpi.c
2 files changed, 6 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/30/80630/1

diff --git a/src/include/acpi/acpi.h b/src/include/acpi/acpi.h
index c39683e..d6c30c1 100644
--- a/src/include/acpi/acpi.h
+++ b/src/include/acpi/acpi.h
@@ -409,6 +409,10 @@
    u32 clock_domain;		/* _CDM Clock Domain */
 } __packed acpi_srat_lapic_t;

+#define ACPI_SRAT_MEMORY_ENABLED	(1 << 0)
+#define ACPI_SRAT_MEMORY_HOT_PLUGGABLE	(1 << 1)
+#define ACPI_SRAT_MEMORY_NONVOLATILE	(1 << 2)
+
 /* SRAT: Memory Affinity Structure */
 typedef struct acpi_srat_mem {
    u8 type;			/* Type (1) */
diff --git a/src/soc/intel/xeon_sp/uncore_acpi.c b/src/soc/intel/xeon_sp/uncore_acpi.c
index bc2d202..518ba71 100644
--- a/src/soc/intel/xeon_sp/uncore_acpi.c
+++ b/src/soc/intel/xeon_sp/uncore_acpi.c
@@ -132,9 +132,9 @@
    	srat_mem[mmap_index].length_low = (uint32_t)(size & 0xffffffff);
    	srat_mem[mmap_index].length_high = (uint32_t)(size >> 32);
    	srat_mem[mmap_index].proximity_domain = mem_element->SocketId;
-		srat_mem[mmap_index].flags = SRAT_ACPI_MEMORY_ENABLED;
+		srat_mem[mmap_index].flags = ACPI_SRAT_MEMORY_ENABLED;
    	if ((mem_element->Type & MEMTYPE_VOLATILE_MASK) == 0)
-			srat_mem[mmap_index].flags |= SRAT_ACPI_MEMORY_NONVOLATILE;
+			srat_mem[mmap_index].flags |= ACPI_SRAT_MEMORY_NONVOLATILE;
    	++mmap_index;
    }