Marshall Dawson has uploaded this change for review. ( https://review.coreboot.org/28474
Change subject: amd/stoneyridge: Adjust memory map for reserved ......................................................................
amd/stoneyridge: Adjust memory map for reserved
Carve out memory to be reported to the OS as reserved. This makes room for a region usable for Boot Error Record Table information.
BUG=b:65446699 TEST=inspect BERT region, and dmesg, on full patch stack. Use test data plus a failing Grunt system.
Change-Id: I0958f6b6bab3fe9dae36c83e1fd9ae6ed0290a18 Signed-off-by: Marshall Dawson marshalldawson3rd@gmail.com --- M src/soc/amd/stoneyridge/ramtop.c 1 file changed, 19 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/74/28474/1
diff --git a/src/soc/amd/stoneyridge/ramtop.c b/src/soc/amd/stoneyridge/ramtop.c index 24386ed..57bb71e 100644 --- a/src/soc/amd/stoneyridge/ramtop.c +++ b/src/soc/amd/stoneyridge/ramtop.c @@ -23,6 +23,7 @@ #include <cpu/amd/amdfam15.h> #include <cbmem.h> #include <stage_cache.h> +#include <arch/bert_storage.h> #include <soc/northbridge.h> #include <soc/southbridge.h>
@@ -36,6 +37,21 @@ return biosram_read32(BIOSRAM_CBMEM_TOP); }
+#if IS_ENABLED(CONFIG_ACPI_BERT) +#define BERT_REGION_MAX_SIZE CONFIG_SMM_TSEG_SIZE +#else +#define BERT_REGION_MAX_SIZE 0 +#endif + +void bert_reserved_region(void **start, size_t *size) +{ + if (IS_ENABLED(CONFIG_ACPI_BERT)) + *start = cbmem_top(); + else + start = NULL; + *size = BERT_REGION_MAX_SIZE; +} + void *cbmem_top(void) { msr_t tom = rdmsr(TOP_MEM); @@ -45,12 +61,13 @@ else /* 8MB alignment to keep MTRR usage low */ return (void *)ALIGN_DOWN(restore_top_of_low_cacheable() - - CONFIG_SMM_TSEG_SIZE, 8*MiB); + - CONFIG_SMM_TSEG_SIZE + - BERT_REGION_MAX_SIZE, 8*MiB); }
static uintptr_t smm_region_start(void) { - return (uintptr_t)cbmem_top(); + return (uintptr_t)cbmem_top() + BERT_REGION_MAX_SIZE; }
static size_t smm_region_size(void)