[coreboot-gerrit] Change in ...coreboot[master]: vboot: remove vboot_handoff_get_recovery_reason

[Joel Kitching (Code Review)]

Joel Kitching has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33532

Change subject: vboot: remove vboot_handoff_get_recovery_reason
......................................................................

vboot: remove vboot_handoff_get_recovery_reason

Two functions retrieve vboot recovery_reason:
* vboot_handoff_get_recovery_reason
* vboot_get_recovery_reason_shared_data

Previously, when CBMEM comes online, a vboot_handoff data
structure is created, and depending on the architecture,
coreboot may eventually lose access to vboot_working_data.

After implementing vboot_working_data CBMEM migration,
vboot_working_data is always guaranteed to be accessible.

vboot_get_recovery_reason_shared_data is corrected to also
allow accessing vboot_working_data in ramstage and postcar.

Now, vboot_handoff_get_recovery reason returning a valid recovery
reason implies that vboot_get_recovery_reason_shared_data should
*also* return a valid recovery reason.  Thus we may remove the
former.

BUG=b:124141368, b:124192753
TEST=make clean && make test-abuild
BRANCH=none

Change-Id: Iac216dc968dd155d9d4f8bd0f2dfd5034762f9a0
Signed-off-by: Joel Kitching 
---
M src/security/vboot/bootmode.c
M src/security/vboot/vboot_common.c
M src/security/vboot/vboot_common.h
3 files changed, 0 insertions(+), 29 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/33532/1

diff --git a/src/security/vboot/bootmode.c b/src/security/vboot/bootmode.c
index 68749f0..0d9721b 100644
--- a/src/security/vboot/bootmode.c
+++ b/src/security/vboot/bootmode.c
@@ -26,10 +26,6 @@

static int vboot_get_recovery_reason_shared_data(void)
 {
-	/* Shared data does not exist for Ramstage and Post-CAR stage. */
-	if (ENV_RAMSTAGE || ENV_POSTCAR)
-		return 0;
-
    struct vb2_shared_data *sd = vboot_get_shared_data();
    assert(sd);
    return sd->recovery_reason;
@@ -115,16 +111,6 @@
    	return reason;

/*
-	 * Check recovery flag in vboot_handoff for stages post CBMEM coming
-	 * online. Since for some stages there is no way to know if cbmem has
-	 * already come online, try looking up handoff anyways. If it fails,
-	 * flow will fallback to looking up shared data.
-	 */
-	if (cbmem_possibly_online() &&
-	    ((reason = vboot_handoff_get_recovery_reason()) != 0))
-		return reason;
-
-	/*
     * For stages where CBMEM might not be online, identify if vboot
     * verification is already complete and no slot was selected
     * i.e. recovery path was requested.
diff --git a/src/security/vboot/vboot_common.c b/src/security/vboot/vboot_common.c
index ff8e6c8..a18bf23 100644
--- a/src/security/vboot/vboot_common.c
+++ b/src/security/vboot/vboot_common.c
@@ -93,19 +93,6 @@
    return vboot_get_handoff_flag(VB_INIT_OUT_ENABLE_RECOVERY);
 }

-int vboot_handoff_get_recovery_reason(void)
-{
-	struct vboot_handoff *vbho;
-	VbSharedDataHeader *sd;
-
-	if (vboot_get_handoff_info((void **)&vbho, NULL))
-		return 0;
-
-	sd = (VbSharedDataHeader *)vbho->shared_data;
-
-	return sd->recovery_reason;
-}
-
 /* ============================ VBOOT REBOOT ============================== */
 void __weak vboot_platform_prepare_reboot(void)
 {
diff --git a/src/security/vboot/vboot_common.h b/src/security/vboot/vboot_common.h
index a785a8b..a3180c1d 100644
--- a/src/security/vboot/vboot_common.h
+++ b/src/security/vboot/vboot_common.h
@@ -59,10 +59,8 @@
  * If vboot handoff is available:
  * Returns 1 for flag if true
  * Returns 0 for flag if false
- * Returns value read for other fields
  */
 int vboot_handoff_check_recovery_flag(void);
-int vboot_handoff_get_recovery_reason(void);

/* ============================ VBOOT REBOOT ============================== */
 /*