Revert "soc/amd/common: Skip psp_verstage on S0i3 resume"

This reverts commit b90e6fdd25. 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>
This commit is contained in:
Karthikeyan Ramasubramanian
2021-09-07 22:27:34 -06:00
committed by Felix Held
parent 36aab93072
commit 2c59a3884d

View File

@ -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()