soc/amd/psp_verstage: Reboot on verstage_soc_early_init fail
Calling reboot_into_recovery with NULL context fails. Initializing ctx
early also fails because the cmos is not ready until after
verstage_soc_early_init. So just reboot and hope for the best.
BUG=None
TEST=Boot guybrush, suspend/resume guybrush
BRANCH=None
Change-Id: I7267a14ab048781b8998d3a6f4220de10e7df250
Signed-off-by: Rob Barnes <robbarnes@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/59017
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
Reviewed-by: Kangheui Won <khwon@chromium.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
diff --git a/src/soc/amd/common/psp_verstage/psp_verstage.c b/src/soc/amd/common/psp_verstage/psp_verstage.c
index 9f27159..3bfa3e9 100644
--- a/src/soc/amd/common/psp_verstage/psp_verstage.c
+++ b/src/soc/amd/common/psp_verstage/psp_verstage.c
@@ -224,8 +224,14 @@
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);
+ /*
+ * If verstage_soc_early_init fails, cmos is probably not
+ * accessible, so rebooting into recovery is not an option.
+ * Just reboot and hope for the best.
+ */
+ svc_write_postcode(POSTCODE_EARLY_INIT_ERROR);
+ svc_debug_print("verstage_soc_early_init failed! -- rebooting\n");
+ vboot_reboot();
}
svc_debug_print("calling verstage_mainboard_early_init\n");