sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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 <shuo.liu@intel.com>
Change-Id: I6aa5c20c9556fd5d680406518d19a83801b0852c
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80630
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <patrick.rudolph@9elements.com>
This commit is contained in:
Shuo Liu
2022-07-05 22:56:28 +08:00
committed by Felix Held
parent 08f1f05bf6
commit 3108ba5a07
5 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/acpi/acpi.h
View File

@@ -409,6 +409,10 @@ typedef struct acpi_srat_lapic {
u32 clock_domain; /* _CDM Clock Domain */ u32 clock_domain; /* _CDM Clock Domain */
} __packed acpi_srat_lapic_t; } __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 */ /* SRAT: Memory Affinity Structure */
typedef struct acpi_srat_mem { typedef struct acpi_srat_mem {
u8 type; /* Type (1) */ u8 type; /* Type (1) */

4
src/soc/intel/xeon_sp/uncore_acpi.c
View File

@@ -132,9 +132,9 @@ static unsigned int get_srat_memory_entries(acpi_srat_mem_t *srat_mem)
srat_mem[mmap_index].length_low = (uint32_t)(size & 0xffffffff); srat_mem[mmap_index].length_low = (uint32_t)(size & 0xffffffff);
srat_mem[mmap_index].length_high = (uint32_t)(size >> 32); srat_mem[mmap_index].length_high = (uint32_t)(size >> 32);
srat_mem[mmap_index].proximity_domain = mem_element->SocketId; 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) 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; ++mmap_index;
} }

5
src/vendorcode/intel/fsp/fsp2_0/cooperlake_sp/hob_memmap.h
View File

@@ -60,11 +60,6 @@ are permitted provided that the following conditions are met:
MAX_SOCKET * MAX_IMC_PER_SOCKET * MAX_SRAT_MEM_ENTRIES_PER_IMC \ MAX_SOCKET * MAX_IMC_PER_SOCKET * MAX_SRAT_MEM_ENTRIES_PER_IMC \
) )
/* ACPI SRAT Memory Flags */
#define SRAT_ACPI_MEMORY_ENABLED (1 << 0)
#define SRAT_ACPI_MEMORY_HOT_REMOVE_SUPPORTED (1 << 1)
#define SRAT_ACPI_MEMORY_NONVOLATILE (1 << 2)
#define MEM_TYPE_RESERVED (1 << 8) #define MEM_TYPE_RESERVED (1 << 8)
#define MEM_ADDR_64MB_SHIFT_BITS 26 #define MEM_ADDR_64MB_SHIFT_BITS 26

5
src/vendorcode/intel/fsp/fsp2_0/sapphirerapids_sp/defs_memmap.h
View File

@@ -45,11 +45,6 @@ are permitted provided that the following conditions are met:
#define MEMTYPE_2LM_MASK (1 << 1) #define MEMTYPE_2LM_MASK (1 << 1)
#define MEMTYPE_VOLATILE_MASK (MEMTYPE_1LM_MASK | MEMTYPE_2LM_MASK) #define MEMTYPE_VOLATILE_MASK (MEMTYPE_1LM_MASK | MEMTYPE_2LM_MASK)
/* ACPI SRAT Memory Flags */
#define SRAT_ACPI_MEMORY_ENABLED (1 << 0)
#define SRAT_ACPI_MEMORY_HOT_REMOVE_SUPPORTED (1 << 1)
#define SRAT_ACPI_MEMORY_NONVOLATILE (1 << 2)
#define MEM_TYPE_RESERVED (1 << 8) #define MEM_TYPE_RESERVED (1 << 8)
#define MEM_ADDR_64MB_SHIFT_BITS 26 #define MEM_ADDR_64MB_SHIFT_BITS 26

5
src/vendorcode/intel/fsp/fsp2_0/skylake_sp/hob_memmap.h
View File

@@ -46,11 +46,6 @@ are permitted provided that the following conditions are met:
MAX_SOCKET * MAX_IMC_PER_SOCKET * MAX_SRAT_MEM_ENTRIES_PER_IMC \ MAX_SOCKET * MAX_IMC_PER_SOCKET * MAX_SRAT_MEM_ENTRIES_PER_IMC \
) )
/* ACPI SRAT Memory Flags */
#define SRAT_ACPI_MEMORY_ENABLED (1 << 0)
#define SRAT_ACPI_MEMORY_HOT_REMOVE_SUPPORTED (1 << 1)
#define SRAT_ACPI_MEMORY_NONVOLATILE (1 << 2)
#define MEM_TYPE_RESERVED (1 << 8) #define MEM_TYPE_RESERVED (1 << 8)
#define MEM_ADDR_64MB_SHIFT_BITS 26 #define MEM_ADDR_64MB_SHIFT_BITS 26