summaryrefslogtreecommitdiff
path: root/src/security/vboot/bootmode.c
diff options
context:
space:
mode:
authorYu-Ping Wu <yupingso@chromium.org>2019-11-14 15:42:25 +0800
committerPatrick Georgi <pgeorgi@google.com>2019-11-20 13:26:17 +0000
commitaeb652a4a04226f467eb8e850b2096d772c6e31e (patch)
treeb213b06ebc949fa800c139587156464b5c126804 /src/security/vboot/bootmode.c
parentea544574d06e8a149c447b35c5e8fba96e61152a (diff)
downloadcoreboot-aeb652a4a04226f467eb8e850b2096d772c6e31e.tar.xz
security/vboot: Remove selected_region from struct vboot_working_data
Since we already have pre-RAM cache for FMAP (CB:36657), calling load_firmware() multiple times is no longer a problem. This patch replaces vboot_get_selected_region() usage with vboot_locate_firmware(), which locates the firmware by reading from the CBMEM cache. In addition, returning false from vboot_is_slot_selected() implies the recovery path was requested, i.e., vb2_shared_data.recovery_reason was set. Therefore, we simply remove the vboot_is_slot_selected() check from vboot_check_recovery_request(). BRANCH=none BUG=chromium:1021452 TEST=emerge-kukui coreboot Change-Id: I27cb1a2175beb189053fc3e44b17b60aba474bb0 Signed-off-by: Yu-Ping Wu <yupingso@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36845 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src/security/vboot/bootmode.c')
-rw-r--r--src/security/vboot/bootmode.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/security/vboot/bootmode.c b/src/security/vboot/bootmode.c
index 0cab0c8559..83baa815c7 100644
--- a/src/security/vboot/bootmode.c
+++ b/src/security/vboot/bootmode.c
@@ -71,9 +71,8 @@ BOOT_STATE_INIT_ENTRY(BS_DEV_INIT, BS_ON_EXIT,
* VB2_RECOVERY_RO_MANUAL.
* 2. Checks if recovery request is present in VBNV and returns the code read
* from it.
- * 3. Checks if vboot verification is done and looks up selected region
- * to identify if vboot_reference library has requested recovery path.
- * If yes, return the reason code from shared data.
+ * 3. Checks if vboot verification is done. If yes, return the reason code from
+ * shared data.
* 4. If nothing applies, return 0 indicating no recovery request.
*/
int vboot_check_recovery_request(void)
@@ -88,11 +87,8 @@ int vboot_check_recovery_request(void)
if ((reason = get_recovery_mode_from_vbnv()) != 0)
return reason;
- /*
- * Identify if vboot verification is already complete and no slot
- * was selected i.e. recovery path was requested.
- */
- if (vboot_logic_executed() && !vboot_is_slot_selected())
+ /* Identify if vboot verification is already complete. */
+ if (vboot_logic_executed())
return vboot_get_recovery_reason_shared_data();
return 0;