diff options
| -rw-r--r-- | src/soc/amd/common/psp_verstage/psp_verstage.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src/soc/amd/common/psp_verstage/psp_verstage.c b/src/soc/amd/common/psp_verstage/psp_verstage.c index 4e2832444e..969c1c0863 100644 --- a/src/soc/amd/common/psp_verstage/psp_verstage.c +++ b/src/soc/amd/common/psp_verstage/psp_verstage.c @@ -3,6 +3,7 @@ #include "psp_verstage.h" #include <amdblocks/acpimmio.h> +#include <bl_uapp/bl_errorcodes_public.h> #include <bl_uapp/bl_syscall_public.h> #include <boot_device.h> #include <cbfs.h> @@ -136,6 +137,25 @@ static uint32_t update_boot_region(struct vb2_context *ctx) return 0; } +static void report_prev_boot_status_to_vboot(void) +{ + uint32_t boot_status = 0; + int ret; + struct vb2_context *ctx = vboot_get_context(); + + /* Already in recovery mode. No need to report previous boot status. */ + if (ctx->flags & VB2_CONTEXT_RECOVERY_MODE) + return; + + ret = svc_get_prev_boot_status(&boot_status); + if (ret != BL_OK || boot_status) { + printk(BIOS_ERR, "PSPFW failure in previous boot: %d:%#8x\n", ret, boot_status); + vbnv_init(); + vb2api_previous_boot_fail(ctx, VB2_RECOVERY_FW_VENDOR_BLOB, + boot_status ? (int)boot_status : ret); + } +} + /* * Save workbuf (and soon memory console and timestamps) to the bootloader to pass * back to coreboot. @@ -288,6 +308,8 @@ void Main(void) verstage_mainboard_init(); post_code(POSTCODE_VERSTAGE_MAIN); + if (CONFIG(SEPARATE_SIGNED_PSPFW)) + report_prev_boot_status_to_vboot(); vboot_run_logic(); |