From d91d2df2ccf2e7239f8f0b3cb74b00110cad5c23 Mon Sep 17 00:00:00 2001 From: Marshall Dawson Date: Thu, 18 Jun 2020 09:53:08 -0600 Subject: 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 Change-Id: I20e99390141986913dd45c2074aa184e992c8ebb Reviewed-on: https://review.coreboot.org/c/coreboot/+/42530 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/soc/amd/picasso/mca.c | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'src/soc/amd/picasso/mca.c') diff --git a/src/soc/amd/picasso/mca.c b/src/soc/amd/picasso/mca.c index cea1c51301..69363f5625 100644 --- a/src/soc/amd/picasso/mca.c +++ b/src/soc/amd/picasso/mca.c @@ -193,31 +193,3 @@ void check_mca(void) for (i = 0 ; i < num_banks ; i++) wrmsr(IA32_MC0_STATUS + (i * 4), mci.sts); } - -void bert_reserved_region(void **start, size_t *size) -{ - const struct cbmem_entry *bert; - - *start = NULL; - *size = 0; - - bert = cbmem_entry_find(CBMEM_ID_BERT_RAW_DATA); - if (!bert) - return; - - *start = cbmem_entry_start(bert); - *size = cbmem_entry_size(bert); -} - -static void alloc_bert_in_cbmem(int unused) -{ - void *p; - - if (CONFIG(ACPI_BERT)) { - p = cbmem_add(CBMEM_ID_BERT_RAW_DATA, CONFIG_ACPI_BERT_SIZE); - if (!p) - printk(BIOS_ERR, "Error: BERT region was not added\n"); - } -} - -ROMSTAGE_CBMEM_INIT_HOOK(alloc_bert_in_cbmem) -- cgit v1.2.3