diff options
Diffstat (limited to 'firmware/lib/vboot_api_kernel.c')
| -rw-r--r-- | firmware/lib/vboot_api_kernel.c | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c index 5139ba33..d6fab619 100644 --- a/firmware/lib/vboot_api_kernel.c +++ b/firmware/lib/vboot_api_kernel.c @@ -262,15 +262,6 @@ static vb2_error_t vb2_kernel_setup(struct vb2_context *ctx, */ sd->vbsd = shared; - /* - * If we're in recovery mode just to do memory retraining, all we - * need to do is reboot. - */ - if (sd->recovery_reason == VB2_RECOVERY_TRAIN_AND_REBOOT) { - VB2_DEBUG("Reboot after retraining in recovery.\n"); - return VBERROR_REBOOT_REQUIRED; - } - /* Fill in params for calls to LoadKernel() */ memset(&lkp, 0, sizeof(lkp)); lkp.kernel_buffer = kparams->kernel_buffer; @@ -373,6 +364,7 @@ vb2_error_t VbSelectAndLoadKernel(struct vb2_context *ctx, VbSharedDataHeader *shared, VbSelectAndLoadKernelParams *kparams) { + struct vb2_shared_data *sd = vb2_get_sd(ctx); vb2_error_t rv, call_rv; rv = vb2_kernel_setup(ctx, shared, kparams); @@ -401,6 +393,27 @@ vb2_error_t VbSelectAndLoadKernel(struct vb2_context *ctx, /* Select boot path */ if (ctx->flags & VB2_CONTEXT_RECOVERY_MODE) { + /* + * Clear recovery request and subcode from nvdata, so that we + * don't get stuck in recovery mode after reboot. Should be + * called at some point after we are certain the system does + * not require any reboots for non-vboot-related reasons (e.g. + * FSP initialization), and before triggering a reboot to exit + * transient recovery mode (e.g. memory retraining request). + */ + vb2_nv_set(ctx, VB2_NV_RECOVERY_REQUEST, + VB2_RECOVERY_NOT_REQUESTED); + vb2_nv_set(ctx, VB2_NV_RECOVERY_SUBCODE, + VB2_RECOVERY_NOT_REQUESTED); + + /* If we're in recovery mode just to do memory retraining, all + we need to do is reboot. */ + if (sd->recovery_reason == VB2_RECOVERY_TRAIN_AND_REBOOT) { + VB2_DEBUG("Reboot after retraining in recovery.\n"); + rv = VBERROR_REBOOT_REQUIRED; + goto VbSelectAndLoadKernel_exit; + } + /* Recovery boot. This has UI. */ if (LEGACY_MENU_UI) rv = VbBootRecoveryMenu(ctx); |