From 746f438ada87ba4219f67355b3ce73b177914fca Mon Sep 17 00:00:00 2001 From: Felix Held Date: Tue, 16 Feb 2021 17:42:56 +0100 Subject: soc/amd: move SMM finalization to common code This adds the SMM finalization to Cezanne. Signed-off-by: Felix Held Change-Id: I1a2b433d92df2a76979e2e6a3d1dde996303ba78 Reviewed-on: https://review.coreboot.org/c/coreboot/+/50801 Reviewed-by: Raul Rangel Tested-by: build bot (Jenkins) --- src/soc/amd/picasso/Makefile.inc | 1 - src/soc/amd/picasso/finalize.c | 55 ---------------------------------------- 2 files changed, 56 deletions(-) delete mode 100644 src/soc/amd/picasso/finalize.c (limited to 'src/soc/amd/picasso') diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc index 8a965c4f0d..c8cc458da0 100644 --- a/src/soc/amd/picasso/Makefile.inc +++ b/src/soc/amd/picasso/Makefile.inc @@ -45,7 +45,6 @@ ramstage-y += reset.c ramstage-y += acp.c ramstage-y += sata.c ramstage-y += uart.c -ramstage-y += finalize.c ramstage-y += soc_util.c ramstage-y += fsp_params.c ramstage-y += graphics.c diff --git a/src/soc/amd/picasso/finalize.c b/src/soc/amd/picasso/finalize.c deleted file mode 100644 index 2df55247cf..0000000000 --- a/src/soc/amd/picasso/finalize.c +++ /dev/null @@ -1,55 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include -#include -#include -#include -#include -#include -#include - -static void per_core_finalize(void *unused) -{ - msr_t hwcr, mask; - - /* Finalize SMM settings */ - hwcr = rdmsr(HWCR_MSR); - if (hwcr.lo & SMM_LOCK) /* Skip if already locked, avoid GPF */ - return; - - if (CONFIG(HAVE_SMI_HANDLER)) { - mask = rdmsr(SMM_MASK_MSR); - mask.lo |= SMM_TSEG_VALID; - wrmsr(SMM_MASK_MSR, mask); - } - - hwcr.lo |= SMM_LOCK; - wrmsr(HWCR_MSR, hwcr); -} - -static void finalize_cores(void) -{ - int r; - printk(BIOS_SPEW, "Lock SMM configuration\n"); - - r = mp_run_on_all_cpus(per_core_finalize, NULL); - if (r) - printk(BIOS_WARNING, "Failed to finalize all cores\n"); -} - -static void soc_finalize(void *unused) -{ - finalize_cores(); - - if (!acpi_is_wakeup_s3()) { - if (CONFIG(HAVE_SMI_HANDLER)) - acpi_disable_sci(); - else - acpi_enable_sci(); - } - - post_code(POST_OS_BOOT); -} - -BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY, soc_finalize, NULL); -BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_LOAD, BS_ON_EXIT, soc_finalize, NULL); -- cgit v1.2.3