diff options
| -rw-r--r-- | src/arch/x86/acpi_bert_storage.c | 17 | ||||
| -rw-r--r-- | src/arch/x86/include/arch/bert_storage.h | 3 | ||||
| -rw-r--r-- | src/soc/amd/common/block/cpu/noncar/memmap.c | 8 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/memmap.c | 13 | ||||
| -rw-r--r-- | src/soc/intel/common/block/systemagent/Kconfig | 8 | ||||
| -rw-r--r-- | src/soc/intel/common/block/systemagent/memmap.c | 11 |
6 files changed, 17 insertions, 43 deletions
diff --git a/src/arch/x86/acpi_bert_storage.c b/src/arch/x86/acpi_bert_storage.c index 7b6b63bcca..62c044137d 100644 --- a/src/arch/x86/acpi_bert_storage.c +++ b/src/arch/x86/acpi_bert_storage.c @@ -567,15 +567,16 @@ cper_ia32x64_context_t *cper_new_ia32x64_context_msr( return ctx; } -/* The region must be in memory marked as reserved. If not implemented, - * skip generating the information in the region. - */ -__weak void bert_reserved_region(void **start, size_t *size) +static void bert_reserved_region(void **start, size_t *size) { - printk(BIOS_ERR, "%s not implemented. BERT region generation disabled\n", - __func__); - *start = NULL; - *size = 0; + if (!CONFIG(ACPI_BERT)) { + *start = NULL; + *size = 0; + } else { + *start = cbmem_add(CBMEM_ID_ACPI_BERT, CONFIG_ACPI_BERT_SIZE); + *size = CONFIG_ACPI_BERT_SIZE; + } + printk(BIOS_INFO, "Reserved BERT region base: %p, size: 0x%zx\n", *start, *size); } static void bert_storage_setup(void *unused) diff --git a/src/arch/x86/include/arch/bert_storage.h b/src/arch/x86/include/arch/bert_storage.h index ea4ec3d2ba..ab44c9c32c 100644 --- a/src/arch/x86/include/arch/bert_storage.h +++ b/src/arch/x86/include/arch/bert_storage.h @@ -44,9 +44,6 @@ #define CRASHLOG_RECORD_TYPE 0x2 #define CRASHLOG_FW_ERR_REV 0x2 -/* Get implementation-specific reserved area for generating BERT info */ -void bert_reserved_region(void **start, size_t *size); - /* Get the region where BERT error structures have been constructed for * generating the ACPI table */ diff --git a/src/soc/amd/common/block/cpu/noncar/memmap.c b/src/soc/amd/common/block/cpu/noncar/memmap.c index 6e35003f0f..dd057c05fa 100644 --- a/src/soc/amd/common/block/cpu/noncar/memmap.c +++ b/src/soc/amd/common/block/cpu/noncar/memmap.c @@ -2,7 +2,6 @@ #include <amdblocks/memmap.h> #include <amdblocks/smm.h> -#include <arch/bert_storage.h> #include <console/console.h> #include <cbmem.h> #include <cpu/amd/msr.h> @@ -59,10 +58,3 @@ void smm_region(uintptr_t *start, size_t *size) once = 1; } } - -void bert_reserved_region(void **start, size_t *size) -{ - *start = cbmem_add(CBMEM_ID_ACPI_BERT, CONFIG_ACPI_BERT_SIZE); - *size = CONFIG_ACPI_BERT_SIZE; - printk(BIOS_INFO, "Reserved BERT region base: %p, size: 0x%zx\n", *start, *size); -} diff --git a/src/soc/amd/stoneyridge/memmap.c b/src/soc/amd/stoneyridge/memmap.c index e411aa2ef3..f7c6b0075c 100644 --- a/src/soc/amd/stoneyridge/memmap.c +++ b/src/soc/amd/stoneyridge/memmap.c @@ -8,23 +8,10 @@ #include <cpu/amd/msr.h> #include <cpu/amd/mtrr.h> #include <cbmem.h> -#include <arch/bert_storage.h> #include <soc/northbridge.h> #include <soc/iomap.h> #include <amdblocks/biosram.h> -void bert_reserved_region(void **start, size_t *size) -{ - if (!CONFIG(ACPI_BERT)) { - *start = NULL; - *size = 0; - } else { - *start = cbmem_add(CBMEM_ID_ACPI_BERT, CONFIG_ACPI_BERT_SIZE); - *size = CONFIG_ACPI_BERT_SIZE; - } - printk(BIOS_INFO, "Reserved BERT region base: %p, size: 0x%zx\n", *start, *size); -} - void *cbmem_top_chipset(void) { msr_t tom = rdmsr(TOP_MEM); diff --git a/src/soc/intel/common/block/systemagent/Kconfig b/src/soc/intel/common/block/systemagent/Kconfig index e9519bc624..e7f6ba49d8 100644 --- a/src/soc/intel/common/block/systemagent/Kconfig +++ b/src/soc/intel/common/block/systemagent/Kconfig @@ -23,4 +23,12 @@ config SA_ENABLE_DPR help This option allows you to add the DMA Protected Range (DPR). +config ACPI_BERT_SIZE + hex + default 0x10000 if ACPI_BERT + default 0x0 + help + Specify the amount of DRAM reserved for gathering the data used to + generate the ACPI table. + endif diff --git a/src/soc/intel/common/block/systemagent/memmap.c b/src/soc/intel/common/block/systemagent/memmap.c index a67d050fcc..86ca4e1b84 100644 --- a/src/soc/intel/common/block/systemagent/memmap.c +++ b/src/soc/intel/common/block/systemagent/memmap.c @@ -7,7 +7,6 @@ #include <cpu/x86/smm.h> #include <intelblocks/fast_spi.h> #include <intelblocks/systemagent.h> -#include <arch/bert_storage.h> #include <types.h> /* @@ -50,22 +49,12 @@ * +---------------------------+ 0 */ -#define BERT_REGION_MAX_SIZE 0x10000 - void smm_region(uintptr_t *start, size_t *size) { *start = sa_get_tseg_base(); *size = sa_get_tseg_size(); } -void bert_reserved_region(void **start, size_t *size) -{ - *start = cbmem_add(CBMEM_ID_ACPI_BERT, BERT_REGION_MAX_SIZE); - *size = BERT_REGION_MAX_SIZE; - - printk(BIOS_DEBUG, "Reserving BERT start %lx, size %zx\n", (uintptr_t)*start, *size); -} - void fill_postcar_frame(struct postcar_frame *pcf) { /* FSP does not seem to bother w.r.t. alignment when asked to place cbmem_top() */ |