Change in coreboot[master]: soc/amd/picasso: Use SMU to put system into S3

[Felix Held (Code Review)]

Hello Marshall Dawson, Marshall Dawson,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/41626

to review the following change.

Change subject: soc/amd/picasso: Use SMU to put system into S3
......................................................................

soc/amd/picasso: Use SMU to put system into S3

Send a message to the SMU to turn off the system power.  SMU will take
the proper final steps based on PmControl[SlpTyp].

BUG=b:153264473
TEST=verify system can enter S3

Change-Id: I3c0d98110c12963aa6fef5d176fd9acaa7ed9f26
Signed-off-by: Marshall Dawson 
Reviewed-on: https://chromium-review.googlesource.com/2140471
Reviewed-by: Furquan Shaikh 
---
M src/soc/amd/picasso/smihandler.c
1 file changed, 4 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/26/41626/1

diff --git a/src/soc/amd/picasso/smihandler.c b/src/soc/amd/picasso/smihandler.c
index d7a46d3..992dc2b 100644
--- a/src/soc/amd/picasso/smihandler.c
+++ b/src/soc/amd/picasso/smihandler.c
@@ -15,6 +15,7 @@
 #include <amdblocks/acpi.h>
 #include <amdblocks/psp.h>
 #include <elog.h>
+#include <soc/smu.h>

/* bits in smm_io_trap   */
 #define SMM_IO_TRAP_PORT_OFFSET		16
@@ -209,11 +210,9 @@

psp_notify_sx_info(slp_typ);

-		/*
-		 * An IO cycle is required to trigger the STPCLK/STPGNT
-		 * handshake when the Pm1 write is reissued.
-		 */
-		outw(pm1cnt | SLP_EN, pm_read16(PM1_CNT_BLK));
+		smu_sx_entry(); /* Leave SlpTypeEn clear, SMU will set */
+		printk(BIOS_ERR, "Error: System did not go to sleep\n");
+
    	hlt();
    }
 }

[Aaron Durbin (Code Review)]

Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41626 )

Change subject: soc/amd/picasso: Use SMU to put system into S3
......................................................................

Patch Set 1: Code-Review+2

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41626 )

Change subject: soc/amd/picasso: Use SMU to put system into S3
......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/coreboot/+/41626/2/src/soc/amd/picasso/smihand... 
File src/soc/amd/picasso/smihandler.c:

https://review.coreboot.org/c/coreboot/+/41626/2/src/soc/amd/picasso/smihand... 
PS2, Line 214: BIOS_ERR
Even `BIOS_EMERG`?

[Felix Held (Code Review)]

Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41626 )

Change subject: soc/amd/picasso: Use SMU to put system into S3
......................................................................

Patch Set 4:

(1 comment)

https://review.coreboot.org/c/coreboot/+/41626/2/src/soc/amd/picasso/smihand... 
File src/soc/amd/picasso/smihandler.c:

https://review.coreboot.org/c/coreboot/+/41626/2/src/soc/amd/picasso/smihand... 
PS2, Line 214: BIOS_ERR
> Even `BIOS_EMERG`?

i'd keep BIOS_ERR. sure, it's a "that shouldn't have happened" type of situation but it's not as fatal as for example no RAM found

[Raul Rangel (Code Review)]

Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41626 )

Change subject: soc/amd/picasso: Use SMU to put system into S3
......................................................................

Patch Set 4: Code-Review+2

[Felix Held (Code Review)]

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

Change subject: soc/amd/picasso: Use SMU to put system into S3
......................................................................

soc/amd/picasso: Use SMU to put system into S3

Send a message to the SMU to turn off the system power.  SMU will take
the proper final steps based on PmControl[SlpTyp].

BUG=b:153264473
TEST=verify system can enter S3

Change-Id: I3c0d98110c12963aa6fef5d176fd9acaa7ed9f26
Signed-off-by: Marshall Dawson 
Reviewed-on: https://chromium-review.googlesource.com/2140471
Reviewed-by: Furquan Shaikh 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41626
Reviewed-by: Raul Rangel 
Reviewed-by: Aaron Durbin 
Tested-by: build bot (Jenkins) 
---
M src/soc/amd/picasso/smihandler.c
1 file changed, 4 insertions(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Aaron Durbin: Looks good to me, approved
  Raul Rangel: Looks good to me, approved

diff --git a/src/soc/amd/picasso/smihandler.c b/src/soc/amd/picasso/smihandler.c
index d7a46d3..992dc2b 100644
--- a/src/soc/amd/picasso/smihandler.c
+++ b/src/soc/amd/picasso/smihandler.c
@@ -15,6 +15,7 @@
 #include <amdblocks/acpi.h>
 #include <amdblocks/psp.h>
 #include <elog.h>
+#include <soc/smu.h>

/* bits in smm_io_trap   */
 #define SMM_IO_TRAP_PORT_OFFSET		16
@@ -209,11 +210,9 @@

psp_notify_sx_info(slp_typ);

-		/*
-		 * An IO cycle is required to trigger the STPCLK/STPGNT
-		 * handshake when the Pm1 write is reissued.
-		 */
-		outw(pm1cnt | SLP_EN, pm_read16(PM1_CNT_BLK));
+		smu_sx_entry(); /* Leave SlpTypeEn clear, SMU will set */
+		printk(BIOS_ERR, "Error: System did not go to sleep\n");
+
    	hlt();
    }
 }

[9elements QA (Code Review)]

9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41626 )

Change subject: soc/amd/picasso: Use SMU to put system into S3
......................................................................

Patch Set 5:

Automatic boot test returned (PASS/FAIL/TOTAL): 4/0/4
Emulation targets:
"QEMU x86 q35/ich9" using payload TianoCore : SUCCESS : https://lava.9esec.io/r/4218
"QEMU x86 q35/ich9" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/4217
"QEMU x86 i440fx/piix4" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/4216
"QEMU AArch64" using payload LinuxBoot_u-root_kexec : SUCCESS : https://lava.9esec.io/r/4215

Please note: This test is under development and might not be accurate at all!