diff options
author | Marshall Dawson <marshalldawson3rd@gmail.com> | 2020-06-18 09:53:08 -0600 |
---|---|---|
committer | Felix Held <felix-coreboot@felixheld.de> | 2020-06-22 22:56:34 +0000 |
commit | d91d2df2ccf2e7239f8f0b3cb74b00110cad5c23 (patch) | |
tree | 3fa0886234e63a643a3456fa15bcf2c8b8d4a611 /src/soc/amd/picasso/memmap.c | |
parent | a138366f3a66544fe98b19db05affb79a621e865 (diff) | |
download | coreboot-d91d2df2ccf2e7239f8f0b3cb74b00110cad5c23.tar.xz |
soc/amd/picasso: Convert BERT reserved region from cbmem
Picasso's BERT region should not have been moved to cbmem in commit
901cb9c "soc/amd/picasso: Move BERT region to cbmem". This
causes an error of "APEI: Can not request [] for APEI BERT registers.
FSP has been modified to set aside a requested region size for BERT,
simiar to TSEG. Remove the cbmem reservation and locate the region
by searching for the HOB.
BUG=b:136987699
TEST=Check that BERT is allocated
Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Change-Id: I20e99390141986913dd45c2074aa184e992c8ebb
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42530
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/amd/picasso/memmap.c')
-rw-r--r-- | src/soc/amd/picasso/memmap.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/soc/amd/picasso/memmap.c b/src/soc/amd/picasso/memmap.c index 42a330726e..74a6c702c0 100644 --- a/src/soc/amd/picasso/memmap.c +++ b/src/soc/amd/picasso/memmap.c @@ -8,6 +8,7 @@ #include <console/console.h> #include <cpu/x86/smm.h> #include <cpu/amd/msr.h> +#include <arch/bert_storage.h> #include <memrange.h> #include <fsp/util.h> #include <FspGuids.h> @@ -60,6 +61,25 @@ void smm_region(uintptr_t *start, size_t *size) } } +void bert_reserved_region(void **start, size_t *size) +{ + struct range_entry bert; + int status; + + *start = NULL; + *size = 0; + + status = fsp_find_range_hob(&bert, AMD_FSP_BERT_HOB_GUID.b); + + if (status < 0) { + printk(BIOS_ERR, "Error: unable to find BERT HOB\n"); + return; + } + + *start = (void *)(uintptr_t)range_entry_base(&bert); + *size = range_entry_size(&bert); +} + void memmap_stash_early_dram_usage(void) { struct memmap_early_dram *e; |