[coreboot-gerrit] Change in coreboot[master]: soc/amd/picasso: If psp_verstage is in RO, don't reset on error

[Aaron Durbin (Code Review)]

Aaron Durbin has submitted this change. ( https://review.coreboot.org/c/coreboot/+/44652 )

Change subject: soc/amd/picasso: If psp_verstage is in RO, don't reset on error
......................................................................

soc/amd/picasso: If psp_verstage is in RO, don't reset on error

If there's already been an error and PSP_verstage is booting to RO,
don't reset the system.  It may be that the error is fatal, but if the
system is stuck, don't intentionally force it into a reboot loop.

BUG=None
TEST=Force an error, still boots to RO instead of going into a boot loop

Signed-off-by: Martin Roth 
Change-Id: Ibb6794fefe9d482850ca31b1d3b0d145fcd8bb8f
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44652
Tested-by: build bot (Jenkins) 
Reviewed-by: Aaron Durbin 
---
M src/soc/amd/picasso/psp_verstage/psp_verstage.c
1 file changed, 14 insertions(+), 8 deletions(-)

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

diff --git a/src/soc/amd/picasso/psp_verstage/psp_verstage.c b/src/soc/amd/picasso/psp_verstage/psp_verstage.c
index 005c8b0..d071aa6 100644
--- a/src/soc/amd/picasso/psp_verstage/psp_verstage.c
+++ b/src/soc/amd/picasso/psp_verstage/psp_verstage.c
@@ -29,6 +29,16 @@
    subcode += PSP_VBOOT_ERROR_SUBCODE;
    svc_write_postcode(subcode);

+	/*
+	 * If there's an error but the PSP_verstage is already booting to RO,
+	 * don't reset the system.  It may be that the error is fatal, but if
+	 * the system is stuck, don't intentionally force it into a reboot loop.
+	 */
+	if (ctx->flags & VB2_CONTEXT_RECOVERY_MODE) {
+		printk(BIOS_ERR, "Already in recovery mode. Staying in RO.\n");
+		return;
+	}
+
    vb2api_fail(ctx, VB2_RECOVERY_RO_UNSPECIFIED, (int)subcode);
    vboot_save_data(ctx);

@@ -231,21 +241,20 @@

verstage_main();

-	vb2api_relocate(_vboot2_work, _vboot2_work, VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE,
-			&ctx);
+	ctx = vboot_get_context();
    retval = check_cmos_recovery();
    if (retval)
-		goto err;
+		reboot_into_recovery(ctx, retval);

post_code(POSTCODE_SAVE_BUFFERS);
    retval = save_buffers(&ctx);
    if (retval)
-		goto err;
+		reboot_into_recovery(ctx, retval);

post_code(POSTCODE_UPDATE_BOOT_REGION);
    retval = update_boot_region(ctx);
    if (retval)
-		goto err;
+		reboot_into_recovery(ctx, retval);

post_code(POSTCODE_UNMAP_SPI_ROM);
    if (boot_dev.base) {
@@ -260,9 +269,6 @@

printk(BIOS_DEBUG, "Leaving verstage on PSP\n");
    svc_exit(retval);
-
-err:
-	reboot_into_recovery(ctx, retval);
 }

const struct region_device *boot_device_ro(void)