[coreboot-gerrit] Change in coreboot[master]: vboot: remove extraneous vboot_recovery_mode_memory_retrain

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/39343 )

Change subject: vboot: remove extraneous vboot_recovery_mode_memory_retrain
......................................................................

vboot: remove extraneous vboot_recovery_mode_memory_retrain

Just call get_recovery_mode_retrain_switch() directly.

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

Change-Id: Icb88d6862db1782e0218276984e527638b21fd3a
Signed-off-by: Joel Kitching 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39343
Tested-by: build bot (Jenkins) 
Reviewed-by: Julius Werner 
Reviewed-by: Angel Pons 
---
M src/drivers/intel/fsp2_0/memory_init.c
M src/drivers/mrc_cache/mrc_cache.c
M src/security/vboot/bootmode.c
M src/security/vboot/vboot_common.h
M src/soc/mediatek/mt8183/memory.c
5 files changed, 5 insertions(+), 10 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Julius Werner: Looks good to me, approved
  Angel Pons: Looks good to me, approved

diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c
index 455dfa5..ad95dce 100644
--- a/src/drivers/intel/fsp2_0/memory_init.c
+++ b/src/drivers/intel/fsp2_0/memory_init.c
@@ -15,6 +15,7 @@
 #include <security/vboot/antirollback.h>
 #include <arch/symbols.h>
 #include <assert.h>
+#include <bootmode.h>
 #include <cbfs.h>
 #include <cbmem.h>
 #include <cf9_reset.h>
@@ -120,7 +121,7 @@
    if (vboot_recovery_mode_enabled()) {
    	if (!CONFIG(HAS_RECOVERY_MRC_CACHE))
    		return;
-		if (vboot_recovery_mode_memory_retrain())
+		if (get_recovery_mode_retrain_switch())
    		return;
    }

diff --git a/src/drivers/mrc_cache/mrc_cache.c b/src/drivers/mrc_cache/mrc_cache.c
index d4a4aab..2287f27 100644
--- a/src/drivers/mrc_cache/mrc_cache.c
+++ b/src/drivers/mrc_cache/mrc_cache.c
@@ -521,7 +521,7 @@
    /* Invalidate only on recovery mode with retraining enabled. */
    if (!vboot_recovery_mode_enabled())
    	return;
-	if (!vboot_recovery_mode_memory_retrain())
+	if (!get_recovery_mode_retrain_switch())
    	return;

if (fmap_locate_area_as_rdev_rw(name, &rdev) < 0) {
diff --git a/src/security/vboot/bootmode.c b/src/security/vboot/bootmode.c
index 2363bf9..6cbb116 100644
--- a/src/security/vboot/bootmode.c
+++ b/src/security/vboot/bootmode.c
@@ -71,11 +71,6 @@
    return 0;
 }

-int vboot_recovery_mode_memory_retrain(void)
-{
-	return get_recovery_mode_retrain_switch();
-}
-
 #if CONFIG(VBOOT_NO_BOARD_SUPPORT)
 /**
  * TODO: Create flash protection interface which implements get_write_protect_state.
diff --git a/src/security/vboot/vboot_common.h b/src/security/vboot/vboot_common.h
index 57f3475..8be9d2a 100644
--- a/src/security/vboot/vboot_common.h
+++ b/src/security/vboot/vboot_common.h
@@ -67,14 +67,12 @@
 #if CONFIG(VBOOT)
 int vboot_developer_mode_enabled(void);
 int vboot_recovery_mode_enabled(void);
-int vboot_recovery_mode_memory_retrain(void);
 int vboot_can_enable_udc(void);
 void vboot_run_logic(void);
 int vboot_locate_cbfs(struct region_device *rdev);
 #else /* !CONFIG_VBOOT */
 static inline int vboot_developer_mode_enabled(void) { return 0; }
 static inline int vboot_recovery_mode_enabled(void) { return 0; }
-static inline int vboot_recovery_mode_memory_retrain(void) { return 0; }
 /* If VBOOT is not enabled, we are okay enabling USB device controller (UDC). */
 static inline int vboot_can_enable_udc(void) { return 1; }
 static inline void vboot_run_logic(void) {}
diff --git a/src/soc/mediatek/mt8183/memory.c b/src/soc/mediatek/mt8183/memory.c
index 78890ea..15ae9cb 100644
--- a/src/soc/mediatek/mt8183/memory.c
+++ b/src/soc/mediatek/mt8183/memory.c
@@ -14,6 +14,7 @@
  */

#include <assert.h>
+#include <bootmode.h>
 #include <cbfs.h>
 #include <console/console.h>
 #include <ip_checksum.h>
@@ -174,7 +175,7 @@
    /* Load calibration params from flash and run fast calibration */
    if (recovery_mode) {
    	printk(BIOS_WARNING, "Skip loading cached calibration data\n");
-		if (vboot_recovery_mode_memory_retrain() ||
+		if (get_recovery_mode_retrain_switch() ||
    	    vboot_check_recovery_request() == VB2_RECOVERY_TRAIN_AND_REBOOT) {
    		printk(BIOS_WARNING, "Retrain memory in next boot\n");
    		/* Use 0xFF as erased flash data. */