Change in coreboot[master]: soc/amd/psp_verstage: Get vb2_context early

[Rob Barnes (Code Review)]

Rob Barnes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/59017 )

Change subject: soc/amd/psp_verstage: Get vb2_context early
......................................................................

soc/amd/psp_verstage: Get vb2_context early

Calling reboot_into_recovery with NULL context fails. Initialize ctx
early so it can be used for reboot_into_recovery if an error occurs.

BUG=None
TEST=Boot guybrush, suspend/resume guybrush
BRANCH=None

Change-Id: I7267a14ab048781b8998d3a6f4220de10e7df250
Signed-off-by: Rob Barnes 
---
M src/soc/amd/common/psp_verstage/psp_verstage.c
1 file changed, 2 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/17/59017/1

diff --git a/src/soc/amd/common/psp_verstage/psp_verstage.c b/src/soc/amd/common/psp_verstage/psp_verstage.c
index 9f27159..91ed7b6 100644
--- a/src/soc/amd/common/psp_verstage/psp_verstage.c
+++ b/src/soc/amd/common/psp_verstage/psp_verstage.c
@@ -220,12 +220,13 @@

svc_write_postcode(POSTCODE_CONSOLE_INIT);
    console_init();
+	ctx = vboot_get_context();

svc_write_postcode(POSTCODE_EARLY_INIT);
    retval = verstage_soc_early_init();
    if (retval) {
    	svc_debug_print("verstage_soc_early_init failed\n");
-		reboot_into_recovery(NULL, retval);
+		reboot_into_recovery(ctx, retval);
    }
    svc_debug_print("calling verstage_mainboard_early_init\n");

@@ -240,7 +241,6 @@

vboot_run_logic();

-	ctx = vboot_get_context();
    retval = check_cmos_recovery();
    if (retval)
    	reboot_into_recovery(ctx, retval);