Yu-Ping Wu has uploaded this change for review.
[WIP] security/vboot: Remove selected_region from struct vboot_working_data
vboot_is_slot_selected() implies vboot_set_selected_region() is called,
which implies (rv != VB2_ERROR_API_PHASE1_RECOVERY) in verstage_main(),
which implies ctx->flags does not contain VB2_CONTEXT_RECOVERY_MODE in vb2api_fw_phase1(),
which implies sd->recovery_reason is 0 in vb2_check_recovery().
As a result, we can safely remove the vboot_is_slot_selected() check.
BRANCH=none
BUG=chromium:1021452
TEST=emerge-kukui coreboot
Change-Id: I501110582669ec4f5c1a009f3fd0c0e310083496
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
---
M src/security/vboot/bootmode.c
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/36847/1
diff --git a/src/security/vboot/bootmode.c b/src/security/vboot/bootmode.c
index bc89e73..30d0241 100644
--- a/src/security/vboot/bootmode.c
+++ b/src/security/vboot/bootmode.c
@@ -113,8 +113,7 @@
* Identify if vboot verification is already complete and no slot
* was selected i.e. recovery path was requested.
*/
- if (vboot_possibly_executed() && vboot_logic_executed() &&
- !vboot_is_slot_selected())
+ if (vboot_possibly_executed() && vboot_logic_executed())
return vboot_get_recovery_reason_shared_data();
return 0;
To view, visit change 36847. To unsubscribe, or for help writing mail filters, visit settings.