vboot: remove VBSD from tests that don't need it

Also clean up a few lines setting unneeded flags and fields in
tests, and add conditionals to check for VBSD in vboot_display.c.

BUG=b:124141368, chromium:1038260
TEST=make clean && make runtests
BRANCH=none

Change-Id: I84438d00777516354529b1e6ee4d04f7947ff971
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1992856
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>

7 files changed, 9 insertions, 32 deletions

diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c
index 36a28323..f0e2e806 100644
--- a/firmware/lib/vboot_display.c
+++ b/firmware/lib/vboot_display.c
@@ -219,7 +219,6 @@ vb2_error_t VbDisplayDebugInfo(struct vb2_context *ctx)
 	struct vb2_shared_data *sd = vb2_get_sd(ctx);
 	struct vb2_gbb_header *gbb = vb2_get_gbb(ctx);
 	struct vb2_workbuf wb;
-	VbSharedDataHeader *shared = sd->vbsd;
 	char buf[DEBUG_INFO_SIZE] = "";
 	char sha1sum[VB2_SHA1_DIGEST_SIZE * 2 + 1];
 	uint32_t used = 0;
@@ -253,10 +252,13 @@ vb2_error_t VbDisplayDebugInfo(struct vb2_context *ctx)
 			RecoveryReasonString(sd->recovery_reason),
 			DEBUG_INFO_SIZE - used);
 
-	/* Add VbSharedDataHeader flags */
-	used += StrnAppend(buf + used, "\nVbSD.flags: 0x", DEBUG_INFO_SIZE - used);
-	used += Uint64ToString(buf + used, DEBUG_INFO_SIZE - used,
-			       shared->flags, 16, 8);
+	/* Add VbSharedDataHeader flags if available */
+	if (sd->vbsd) {
+		used += StrnAppend(buf + used, "\nVbSD.flags: 0x",
+				   DEBUG_INFO_SIZE - used);
+		used += Uint64ToString(buf + used, DEBUG_INFO_SIZE - used,
+				       sd->vbsd->flags, 16, 8);
+	}
 
 	/* Add raw contents of VbNvStorage */
 	used += StrnAppend(buf + used, "\nVbNv.raw:", DEBUG_INFO_SIZE - used);
@@ -332,8 +334,8 @@ vb2_error_t VbDisplayDebugInfo(struct vb2_context *ctx)
 	}
 
 	/* If we're in dev-mode, show the kernel subkey that we expect, too. */
-	if (0 == sd->recovery_reason) {
-		FillInSha1Sum(sha1sum, &shared->kernel_subkey);
+	if (0 == sd->recovery_reason && sd->vbsd) {
+		FillInSha1Sum(sha1sum, &sd->vbsd->kernel_subkey);
 		used += StrnAppend(buf + used,
 				"\nkernel_subkey: ", DEBUG_INFO_SIZE - used);
 		used += StrnAppend(buf + used, sha1sum, DEBUG_INFO_SIZE - used);
diff --git a/tests/vb2_auxfw_sync_tests.c b/tests/vb2_auxfw_sync_tests.c
index 3ce0cd7f..2ed72dde 100644
--- a/tests/vb2_auxfw_sync_tests.c
+++ b/tests/vb2_auxfw_sync_tests.c
@@ -23,9 +23,6 @@
 #include "vboot_struct.h"
 
 /* Mock data */
-static uint8_t shared_data[VB_SHARED_DATA_MIN_SIZE];
-static VbSharedDataHeader *shared = (VbSharedDataHeader *)shared_data;
-
 static struct vb2_context *ctx;
 static uint8_t workbuf[VB2_KERNEL_WORKBUF_RECOMMENDED_SIZE]
 	__attribute__((aligned(VB2_WORKBUF_ALIGN)));
@@ -52,13 +49,10 @@ static void ResetMocks(void)
 	vb2_nv_init(ctx);
 
 	sd = vb2_get_sd(ctx);
-	sd->vbsd = shared;
 	sd->flags |= VB2_SD_FLAG_DISPLAY_AVAILABLE;
 
 	memset(&gbb, 0, sizeof(gbb));
 
-	memset(&shared_data, 0, sizeof(shared_data));
-
 	memset(screens_displayed, 0, sizeof(screens_displayed));
 	screens_count = 0;
 
diff --git a/tests/vb2_ec_sync_tests.c b/tests/vb2_ec_sync_tests.c
index 259f6479..f8d4d6ff 100644
--- a/tests/vb2_ec_sync_tests.c
+++ b/tests/vb2_ec_sync_tests.c
@@ -19,9 +19,6 @@
 #include "vboot_struct.h"
 
 /* Mock data */
-static uint8_t shared_data[VB_SHARED_DATA_MIN_SIZE];
-static VbSharedDataHeader *shared = (VbSharedDataHeader *)shared_data;
-
 static int mock_in_rw;
 static vb2_error_t in_rw_retval;
 static int protect_retval;
@@ -62,13 +59,10 @@ static void ResetMocks(void)
 	vb2_nv_init(ctx);
 
 	sd = vb2_get_sd(ctx);
-	sd->vbsd = shared;
 	sd->flags |= VB2_SD_FLAG_DISPLAY_AVAILABLE;
 
 	memset(&gbb, 0, sizeof(gbb));
 
-	memset(&shared_data, 0, sizeof(shared_data));
-
 	mock_in_rw = 0;
 	ec_ro_protected = 0;
 	ec_rw_protected = 0;
diff --git a/tests/vboot_api_devmode_tests.c b/tests/vboot_api_devmode_tests.c
index 5754d8ff..a26b9f67 100644
--- a/tests/vboot_api_devmode_tests.c
+++ b/tests/vboot_api_devmode_tests.c
@@ -96,8 +96,6 @@ static uint8_t workbuf[VB2_KERNEL_WORKBUF_RECOMMENDED_SIZE]
 static struct vb2_context *ctx;
 static struct vb2_shared_data *sd;
 static struct vb2_gbb_header gbb;
-static uint8_t shared_data[VB_SHARED_DATA_MIN_SIZE];
-static VbSharedDataHeader* shared = (VbSharedDataHeader*)shared_data;
 static int current_time;
 static uint64_t current_ticks;
 static int current_event;
@@ -119,16 +117,12 @@ static void ResetMocks(void)
 	vb2_nv_init(ctx);
 
 	sd = vb2_get_sd(ctx);
-	sd->vbsd = shared;
 
 	ctx->flags |= VB2_CONTEXT_NO_SECDATA_FWMP;
 	sd->status |= VB2_SD_STATUS_SECDATA_FWMP_INIT;
 
 	memset(&gbb, 0, sizeof(gbb));
 
-	memset(&shared_data, 0, sizeof(shared_data));
-	shared->fw_keyblock_flags = 0xABCDE0;
-
 	current_ticks = 0;
 	current_time = 0;
 
diff --git a/tests/vboot_api_kernel2_tests.c b/tests/vboot_api_kernel2_tests.c
index 0b2b97be..55cd7cad 100644
--- a/tests/vboot_api_kernel2_tests.c
+++ b/tests/vboot_api_kernel2_tests.c
@@ -1476,7 +1476,6 @@ static void VbBootRecTest(void)
 
 	/* Test Diagnostic Mode via Ctrl-C OS broken - display available */
 	ResetMocks();
-	shared->flags = 0;
 	MockGpioAfter(10, GPIO_SHUTDOWN);
 	mock_keypress[0] = VB_KEY_CTRL('C');
 	TEST_EQ(vb2_nv_get(ctx, VB2_NV_DIAG_REQUEST), 0,
diff --git a/tests/vboot_detach_menu_tests.c b/tests/vboot_detach_menu_tests.c
index 705c874e..41c89dd5 100644
--- a/tests/vboot_detach_menu_tests.c
+++ b/tests/vboot_detach_menu_tests.c
@@ -63,7 +63,6 @@ static int vbexaltfwmask_called;
 static void ResetMocks(void)
 {
 	memset(&shared_data, 0, sizeof(shared_data));
-	shared->flags = VBSD_BOOT_FIRMWARE_VBOOT2;
 
 	memset(&lkp, 0, sizeof(lkp));
 
diff --git a/tests/vboot_display_tests.c b/tests/vboot_display_tests.c
index 634462e3..2fa5ac97 100644
--- a/tests/vboot_display_tests.c
+++ b/tests/vboot_display_tests.c
@@ -22,8 +22,6 @@
 #include "vboot_kernel.h"
 
 /* Mock data */
-static uint8_t shared_data[VB_SHARED_DATA_MIN_SIZE];
-static VbSharedDataHeader *shared = (VbSharedDataHeader *)shared_data;
 static char debug_info[4096];
 static struct vb2_context *ctx;
 static struct vb2_shared_data *sd;
@@ -43,9 +41,6 @@ static void ResetMocks(void)
 	vb2_nv_init(ctx);
 
 	sd = vb2_get_sd(ctx);
-	sd->vbsd = shared;
-
-	memset(&shared_data, 0, sizeof(shared_data));
 
 	*debug_info = 0;
 }