Julius Werner merged this change.

View Change

vboot: Turn vboot_logic_executed() into a static inline

This patch moves vboot_logic_executed() (and its dependencies) into a
header and turns it into a static inline function. The function is used
to guard larger amounts of code in several places, so this should allow
us to save some more space through compile-time elimination (and also
makes it easier to avoid undefined reference issues in some cases).

Change-Id: I193f608882cbfe07dc91ee90d02fafbd67a3c324
Signed-off-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32716
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
---
M src/security/vboot/misc.h
M src/security/vboot/vboot_loader.c
2 files changed, 57 insertions(+), 54 deletions(-)

diff --git a/src/security/vboot/misc.h b/src/security/vboot/misc.h
index b4fae19..23159c8 100644
--- a/src/security/vboot/misc.h
+++ b/src/security/vboot/misc.h
@@ -16,6 +16,8 @@
 #ifndef __VBOOT_MISC_H__
 #define __VBOOT_MISC_H__
 
+#include <assert.h>
+#include <arch/early_variables.h>
 #include <security/vboot/vboot_common.h>
 
 struct vb2_context;
@@ -66,13 +68,62 @@
 void vboot_fill_handoff(void);
 
 /*
- * Source: security/vboot/vboot_loader.c
- */
-int vboot_logic_executed(void);
-
-/*
  * Source: security/vboot/bootmode.c
  */
 void vboot_save_recovery_reason_vbnv(void);
 
+/*
+ * The stage loading code is compiled and entered from multiple stages. The
+ * helper functions below attempt to provide more clarity on when certain
+ * code should be called. They are implemented inline for better compile-time
+ * code elimination.
+ */
+
+static inline int verification_should_run(void)
+{
+	if (CONFIG(VBOOT_SEPARATE_VERSTAGE))
+		return ENV_VERSTAGE;
+	else if (CONFIG(VBOOT_STARTS_IN_ROMSTAGE))
+		return ENV_ROMSTAGE;
+	else if (CONFIG(VBOOT_STARTS_IN_BOOTBLOCK))
+		return ENV_BOOTBLOCK;
+	else
+		dead_code();
+}
+
+static inline int verstage_should_load(void)
+{
+	if (CONFIG(VBOOT_SEPARATE_VERSTAGE))
+		return ENV_BOOTBLOCK;
+	else
+		return 0;
+}
+
+static inline int vboot_logic_executed(void)
+{
+	extern int vboot_executed;	/* should not be globally accessible */
+
+	/* If we are in the stage that runs verification, or in the stage that
+	   both loads the verstage and is returned to from it afterwards, we
+	   need to check a global to see if verfication has run. */
+	if (verification_should_run() ||
+	    (verstage_should_load() && CONFIG(VBOOT_RETURN_FROM_VERSTAGE)))
+		return car_get_var(vboot_executed);
+
+	if (CONFIG(VBOOT_STARTS_IN_BOOTBLOCK)) {
+		/* All other stages are "after the bootblock" */
+		return !ENV_BOOTBLOCK;
+	} else if (CONFIG(VBOOT_STARTS_IN_ROMSTAGE)) {
+		/* Post-RAM stages are "after the romstage" */
+#ifdef __PRE_RAM__
+		return 0;
+#else
+		return 1;
+#endif
+	} else {
+		dead_code();
+	}
+}
+
+
 #endif /* __VBOOT_MISC_H__ */
diff --git a/src/security/vboot/vboot_loader.c b/src/security/vboot/vboot_loader.c
index 3bbb3da..1350307 100644
--- a/src/security/vboot/vboot_loader.c
+++ b/src/security/vboot/vboot_loader.c
@@ -36,55 +36,7 @@
 	       CONFIG(VBOOT_SEPARATE_VERSTAGE),
 	       "return from verstage only makes sense for separate verstages");
 
-/* The stage loading code is compiled and entered from multiple stages. The
- * helper functions below attempt to provide more clarity on when certain
- * code should be called. */
-
-static int verification_should_run(void)
-{
-	if (CONFIG(VBOOT_SEPARATE_VERSTAGE))
-		return ENV_VERSTAGE;
-	else if (CONFIG(VBOOT_STARTS_IN_ROMSTAGE))
-		return ENV_ROMSTAGE;
-	else if (CONFIG(VBOOT_STARTS_IN_BOOTBLOCK))
-		return ENV_BOOTBLOCK;
-	else
-		die("impossible!");
-}
-
-static int verstage_should_load(void)
-{
-	if (CONFIG(VBOOT_SEPARATE_VERSTAGE))
-		return ENV_BOOTBLOCK;
-	else
-		return 0;
-}
-
-static int vboot_executed CAR_GLOBAL;
-
-int vboot_logic_executed(void)
-{
-	/* If we are in the stage that runs verification, or in the stage that
-	   both loads the verstage and is returned to from it afterwards, we
-	   need to check a global to see if verfication has run. */
-	if (verification_should_run() ||
-	    (verstage_should_load() && CONFIG(VBOOT_RETURN_FROM_VERSTAGE)))
-		return car_get_var(vboot_executed);
-
-	if (CONFIG(VBOOT_STARTS_IN_BOOTBLOCK)) {
-		/* All other stages are "after the bootblock" */
-		return !ENV_BOOTBLOCK;
-	} else if (CONFIG(VBOOT_STARTS_IN_ROMSTAGE)) {
-		/* Post-RAM stages are "after the romstage" */
-#ifdef __PRE_RAM__
-		return 0;
-#else
-		return 1;
-#endif
-	} else {
-		die("impossible!");
-	}
-}
+int vboot_executed CAR_GLOBAL;
 
 static void vboot_prepare(void)
 {

To view, visit change 32716. To unsubscribe, or for help writing mail filters, visit settings.