[coreboot-gerrit] Change in coreboot[master]: soc/amd/picasso: Skip SmmInfo to PSP on S3 resume

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/44398 )

Change subject: soc/amd/picasso: Skip SmmInfo to PSP on S3 resume
......................................................................

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) 
---
M src/soc/amd/picasso/smi.c
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Held: Looks good to me, approved

diff --git a/src/soc/amd/picasso/smi.c b/src/soc/amd/picasso/smi.c
index 125dde6..5822151 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 @@
    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);
 }