summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarshall Dawson <marshalldawson3rd@gmail.com>2020-08-11 13:04:51 -0600
committerFelix Held <felix-coreboot@felixheld.de>2020-10-19 15:37:12 +0000
commit5dbe45e0f5608794e03634aed28530ddb2ab9ac5 (patch)
tree274c9af8b8633cbea0c0ef701dd7a5a5a5ef4208
parent188f1bd5b84e22763680f2bb9b1908835537b3d7 (diff)
downloadcoreboot-5dbe45e0f5608794e03634aed28530ddb2ab9ac5.tar.xz
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 <marshalldawson3rd@gmail.com> Change-Id: Ib75a20c9594bc331aa7abf77be95196085a3dbc6 Reviewed-on: https://review.coreboot.org/c/coreboot/+/44398 Reviewed-by: Felix Held <felix-coreboot@felixheld.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/soc/amd/picasso/smi.c4
1 files changed, 3 insertions, 1 deletions
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 <acpi/acpi.h>
#include <arch/io.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
@@ -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);
}