From 5dbe45e0f5608794e03634aed28530ddb2ab9ac5 Mon Sep 17 00:00:00 2001 From: Marshall Dawson Date: Tue, 11 Aug 2020 13:04:51 -0600 Subject: [PATCH] soc/amd/picasso: Skip SmmInfo to PSP on S3 resume The PSP does not accept the SmmInfo command during a resume so remove the call. BUG=b:163017485 TEST=Run SST on trembyle, verify error message goes away BRANCH=Zork Signed-off-by: Marshall Dawson Change-Id: Ib75a20c9594bc331aa7abf77be95196085a3dbc6 Reviewed-on: https://review.coreboot.org/c/coreboot/+/44398 Reviewed-by: Felix Held Tested-by: build bot (Jenkins) --- src/soc/amd/picasso/smi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/soc/amd/picasso/smi.c b/src/soc/amd/picasso/smi.c index 125dde601c..58221513a1 100644 --- a/src/soc/amd/picasso/smi.c +++ b/src/soc/amd/picasso/smi.c @@ -4,6 +4,7 @@ * Utilities for SMM setup */ +#include #include #include #include @@ -19,5 +20,6 @@ void global_smi_enable(void) reg |= SMITRG0_EOS; /* Set EOS bit */ smi_write32(SMI_REG_SMITRIG0, reg); - outb(APM_CNT_SMMINFO, APM_CNT); + if (!acpi_is_wakeup_s3()) + outb(APM_CNT_SMMINFO, APM_CNT); }