GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/amd: factor out acpi_soc_get_bert_region to amd/common 

This also adds BERT table gerenation support for Cezanne, but since the
functionality to populate the BERT memory region isn't implemented yet,
this won't result in a BERT table being generated on Cezanne, since
bert_generate_ssdt will always return false there.

TEST=BERT ACPI table generation still works on AMD/Mandolin

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I69b4a9a7432041e1f4902436fa4e6dee5332dbd2
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55056
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
This commit is contained in:
Felix Held 2021-05-28 17:59:09 +02:00
parent a389b3cb4d
commit f0c52768f3
4 changed files with 26 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/soc/amd/common/block/acpi/Makefile.inc
View File

@ -9,6 +9,7 @@ smm-y += acpi.c
ramstage-y += pm_state.c
ramstage-y += tables.c
ramstage-$(CONFIG_ACPI_BERT) += bert.c
ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPI_ALIB) += alib.c
ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPI_GPIO) += gpio.c

25
src/soc/amd/common/block/acpi/bert.c Normal file
View File

@ -0,0 +1,25 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi.h>
#include <arch/bert_storage.h>
#include <console/console.h>
#include <types.h>
enum cb_err acpi_soc_get_bert_region(void **region, size_t *length)
{
/*
* Skip the table if no errors are present. ACPI driver reports
* a table with a 0-length region:
* BERT: [Firmware Bug]: table invalid.
*/
if (!bert_should_generate_acpi_table())
return CB_ERR;
bert_errors_region(region, length);
if (!region) {
printk(BIOS_ERR, "Error: Can't find BERT storage area\n");
return CB_ERR;
}
return CB_SUCCESS;
}

20
src/soc/amd/picasso/agesa_acpi.c
View File

@ -3,7 +3,6 @@
#include <acpi/acpi.h>
#include <acpi/acpi_crat.h>
#include <acpi/acpi_ivrs.h>
#include <arch/bert_storage.h>
#include <console/console.h>
#include <cpu/amd/cpuid.h>
#include <cpu/amd/msr.h>
@ -1017,22 +1016,3 @@ uintptr_t agesa_write_acpi_tables(const struct device *device, uintptr_t current
return current;
}
enum cb_err acpi_soc_get_bert_region(void **region, size_t *length)
{
/*
* Skip the table if no errors are present. ACPI driver reports
* a table with a 0-length region:
* BERT: [Firmware Bug]: table invalid.
*/
if (!bert_should_generate_acpi_table())
return CB_ERR;
bert_errors_region(region, length);
if (!region) {
printk(BIOS_ERR, "Error: Can't find BERT storage area\n");
return CB_ERR;
}
return CB_SUCCESS;
}

20
src/soc/amd/stoneyridge/northbridge.c
View File

@ -26,7 +26,6 @@
#include <soc/iomap.h>
#include <stdint.h>
#include <string.h>
#include <arch/bert_storage.h>
#include "chip.h"
@ -326,25 +325,6 @@ static const struct pci_driver family15_northbridge __pci_driver = {
.devices = pci_device_ids,
};
enum cb_err acpi_soc_get_bert_region(void **region, size_t *length)
{
/*
* Skip the table if no errors are present. ACPI driver reports
* a table with a 0-length region:
* BERT: [Firmware Bug]: table invalid.
*/
if (!bert_should_generate_acpi_table())
return CB_ERR;
bert_errors_region(region, length);
if (!region) {
printk(BIOS_ERR, "Error: Can't find BERT storage area\n");
return CB_ERR;
}
return CB_SUCCESS;
}
/*
* Enable VGA cycles. Set memory ranges of the FCH legacy devices (TPM, HPET,
* BIOS RAM, Watchdog Timer, IOAPIC and ACPI) as non-posted. Set remaining