Fred Reitberger has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/63087 )
Change subject: soc/amd/picasso/cpu.c: Skip SMMINFO init in S3 resume ......................................................................
soc/amd/picasso/cpu.c: Skip SMMINFO init in S3 resume
SMMINFO is already set up in S5, so it should be skipped in S3 resume
TEST=builds
Change-Id: Ia58000ce9dac5ecb69ca39354f7775524e439bd0 Signed-off-by: Fred Reitberger reitbergerfred@gmail.com --- M src/soc/amd/picasso/cpu.c 1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/63087/1
diff --git a/src/soc/amd/picasso/cpu.c b/src/soc/amd/picasso/cpu.c index de6e9c0..f14ee49 100644 --- a/src/soc/amd/picasso/cpu.c +++ b/src/soc/amd/picasso/cpu.c @@ -10,6 +10,7 @@ #include <cpu/x86/mtrr.h> #include <cpu/x86/msr.h> #include <cpu/x86/smm.h> +#include <acpi/acpi.h> #include <device/device.h> #include <device/pci_ops.h> #include <soc/pci_devs.h> @@ -41,7 +42,10 @@ static void post_mp_init(void) { global_smi_enable(); - apm_control(APM_CNT_SMMINFO); + + /* SMMINFO only needs to be set up when booting from S5 */ + if (!acpi_is_wakeup_s3()) + apm_control(APM_CNT_SMMINFO); }
static const struct mp_ops mp_ops = {