From adfafba793684ed92965dfbd86b3fb3463975d8c Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Tue, 8 Nov 2016 10:47:36 -0800 Subject: Add new recovery reason for rec hash space lock failure in RO firmware BUG=chrome-os-partner:59355 BRANCH=None TEST=make -j runtests Change-Id: Ife661afea83f65ba262e50e9743a64628972d39e Signed-off-by: Furquan Shaikh Reviewed-on: https://chromium-review.googlesource.com/408568 Reviewed-by: Aaron Durbin Reviewed-by: Randall Spangler --- firmware/2lib/include/2recovery_reasons.h | 3 +++ firmware/include/vboot_nvstorage.h | 2 ++ firmware/lib/vboot_display.c | 2 ++ 3 files changed, 7 insertions(+) diff --git a/firmware/2lib/include/2recovery_reasons.h b/firmware/2lib/include/2recovery_reasons.h index 441c58c5..21509298 100644 --- a/firmware/2lib/include/2recovery_reasons.h +++ b/firmware/2lib/include/2recovery_reasons.h @@ -202,6 +202,9 @@ enum vb2_nv_recovery { /* Fastboot mode requested in firmware */ VB2_RECOVERY_FW_FASTBOOT = 0x5e, + /* Recovery hash space lock error in RO firmware */ + VB2_RECOVERY_RO_TPM_REC_HASH_L_ERROR = 0x5f, + /* Unspecified/unknown error in rewritable firmware */ VB2_RECOVERY_RW_UNSPECIFIED = 0x7f, diff --git a/firmware/include/vboot_nvstorage.h b/firmware/include/vboot_nvstorage.h index c43f2eb4..8c7ff9d3 100644 --- a/firmware/include/vboot_nvstorage.h +++ b/firmware/include/vboot_nvstorage.h @@ -278,6 +278,8 @@ typedef enum VbFwResult { #define VBNV_RECOVERY_RW_BCB_ERROR 0x5C /* Fastboot mode requested in firmware */ #define VBNV_RECOVERY_FW_FASTBOOT 0x5E +/* Recovery hash space lock error in RO firmware */ +#define VBNV_RECOVERY_RO_TPM_REC_HASH_L_ERROR 0x5F /* Unspecified/unknown error in rewritable firmware */ #define VBNV_RECOVERY_RW_UNSPECIFIED 0x7F /* DM-verity error */ diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c index e4720046..1abed924 100644 --- a/firmware/lib/vboot_display.c +++ b/firmware/lib/vboot_display.c @@ -527,6 +527,8 @@ const char *RecoveryReasonString(uint8_t code) return "BCB partition error on disk"; case VBNV_RECOVERY_FW_FASTBOOT: return "Fastboot-mode requested in firmware"; + case VBNV_RECOVERY_RO_TPM_REC_HASH_L_ERROR: + return "Recovery hash space lock error in RO firmware"; case VBNV_RECOVERY_RW_UNSPECIFIED: return "Unspecified/unknown error in RW firmware"; case VBNV_RECOVERY_KE_DM_VERITY: -- cgit v1.2.1