diff options
| author | Karthikeyan Ramasubramanian <kramasub@google.com> | 2021-09-07 22:27:34 -0600 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2021-09-09 20:41:31 +0000 |
| commit | 2c59a3884d0b95ec87b21be9c28df9416eb1bbef (patch) | |
| tree | 5c57fc3bdc0b9312ab1a8e8d7c17d4fec798e568 /src/soc | |
| parent | 36aab9307265bac8ef8bca59af1e8bda810f192c (diff) | |
Revert "soc/amd/common: Skip psp_verstage on S0i3 resume"
This reverts commit b90e6fdd25f7fcc9db6be50a0b117a7509c6fdb1. Latest
releases of PSP does not load PSP verstage on S0i3 resume. Hence no need
to skip PSP verstage on S0i3 resume.
BUG=b:196400450
TEST=Build and boot to OS in Guybrush. Trigger a suspend/resume cycle
and then a reboot and ensure that the system boots to OS.
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@google.com>
Change-Id: Iaeb92edb69662e6c06f4d0e3d7b760d4597bf650
Reviewed-on: https://review.coreboot.org/c/coreboot/+/57506
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/amd/common/psp_verstage/psp_verstage.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/soc/amd/common/psp_verstage/psp_verstage.c b/src/soc/amd/common/psp_verstage/psp_verstage.c index d223c945db..5c59c4f4e4 100644 --- a/src/soc/amd/common/psp_verstage/psp_verstage.c +++ b/src/soc/amd/common/psp_verstage/psp_verstage.c @@ -200,16 +200,6 @@ void Main(void) { uint32_t retval; struct vb2_context *ctx = NULL; - uint32_t bootmode = 0; - - /* - * Currently, we want to skip running verstage on all S0i3 resumes. This relies - * on an assumption that the PSP will be checksumming all of its components. - * TODO(b/196400450): Remove when PSP no longer loads verstage on S0i3 resume. - */ - svc_get_boot_mode(&bootmode); - if (bootmode == PSP_BOOT_MODE_S0i3_RESUME) - svc_exit(0); /* * Do not use printk() before console_init() |