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

soc/amd/stoneyridge: request binaryPI to use \_SB_ scope in PSTATE SSDT 

Instead of having binaryPI generate a PSTATE SSDT that uses \_PR_ as the
scope for the CPU objects and patching this SSDT in coreboot to use the
\_SB_ scope in patch_ssdt_processor_scope, request binaryPI to use the
\_SB_ scope instead by setting the late platform configuration option
ProcessorScopeInSb to true.

TEST=Careena still boots and Linux doesn't show any ACPI errors with
this patch applied. With only patch_ssdt_processor_scope removed, but
the ProcessorScopeInSb option not set, Linux will complain that it can't
resolve the \PR.P00x symbols.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: If88820a0f5df923f129e2e3b5335f5f0e38ee7f5
Reviewed-on: https://review.coreboot.org/c/coreboot/+/73385
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martin.roth@amd.corp-partner.google.com>
This commit is contained in:
Felix Held 2023-03-02 19:45:21 +01:00
parent 059370898c
commit f0c1c9791b
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/soc/amd/common/pi/agesawrapper.c
View File

@ -266,6 +266,9 @@ static AGESA_STATUS amd_init_late(AMD_LATE_PARAMS *LateParams)
LateParams->GnbLateConfiguration.FchIoapicId = FCH_IOAPIC_ID; LateParams->GnbLateConfiguration.FchIoapicId = FCH_IOAPIC_ID;
} }
/* Make binaryPI use \_SB_ as processor object scope in PSTATE SSDT */
LateParams->PlatformConfig.ProcessorScopeInSb = true;
timestamp_add_now(TS_AGESA_INIT_LATE_START); timestamp_add_now(TS_AGESA_INIT_LATE_START);
Status = amd_dispatch(LateParams); Status = amd_dispatch(LateParams);
timestamp_add_now(TS_AGESA_INIT_LATE_END); timestamp_add_now(TS_AGESA_INIT_LATE_END);

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

@ -207,21 +207,6 @@ static void northbridge_fill_ssdt_generator(const struct device *device)
acpigen_pop_len(); acpigen_pop_len();
} }
static void patch_ssdt_processor_scope(acpi_header_t *ssdt)
{
unsigned int len = ssdt->length - sizeof(acpi_header_t);
unsigned int i;
for (i = sizeof(acpi_header_t); i < len; i++) {
/* Search for _PR_ scope and replace it with _SB_ */
if (*(uint32_t *)((unsigned long)ssdt + i) == 0x5f52505f)
*(uint32_t *)((unsigned long)ssdt + i) = 0x5f42535f;
}
/* Recalculate checksum */
ssdt->checksum = 0;
ssdt->checksum = acpi_checksum((void *)ssdt, ssdt->length);
}
static unsigned long agesa_write_acpi_tables(const struct device *device, static unsigned long agesa_write_acpi_tables(const struct device *device,
unsigned long current, unsigned long current,
acpi_rsdp_t *rsdp) acpi_rsdp_t *rsdp)
@ -296,7 +281,6 @@ static unsigned long agesa_write_acpi_tables(const struct device *device,
printk(BIOS_DEBUG, "ACPI: * SSDT at %lx\n", current); printk(BIOS_DEBUG, "ACPI: * SSDT at %lx\n", current);
ssdt = (acpi_header_t *)agesawrapper_getlateinitptr(PICK_PSTATE); ssdt = (acpi_header_t *)agesawrapper_getlateinitptr(PICK_PSTATE);
if (ssdt != NULL) { if (ssdt != NULL) {
patch_ssdt_processor_scope(ssdt);
memcpy((void *)current, ssdt, ssdt->length); memcpy((void *)current, ssdt, ssdt->length);
ssdt = (acpi_header_t *)current; ssdt = (acpi_header_t *)current;
current += ssdt->length; current += ssdt->length;