From 9fc8cf89e881f252ab95ce080046b3143aa0c734 Mon Sep 17 00:00:00 2001
From: Yu-Ping Wu <yupingso@chromium.org>
Date: Wed, 13 Nov 2019 15:57:45 +0800
Subject: [PATCH] security/vboot: Remove flags from struct vboot_working_data

Since now we have persistent context, the usage of the flags can be
replaced with vb2_context.flags.

BRANCH=none
BUG=chromium:1021452
TEST=emerge-kukui coreboot

Change-Id: I8e5757a8cc09712c3acde9cbaab910b7498681b4
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36808
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
---
 src/lib/bootmode.c               | 6 +++---
 src/security/vboot/bootmode.c    | 4 ++--
 src/security/vboot/misc.h        | 9 ---------
 src/security/vboot/vboot_logic.c | 8 --------
 4 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/src/lib/bootmode.c b/src/lib/bootmode.c
index 2465966b3a..06f6d05e47 100644
--- a/src/lib/bootmode.c
+++ b/src/lib/bootmode.c
@@ -16,6 +16,7 @@
 #include <assert.h>
 #include <bootmode.h>
 #include <security/vboot/misc.h>
+#include <vb2_api.h>
 
 static int gfx_init_done = -1;
 
@@ -33,14 +34,13 @@ void gfx_set_init_done(int done)
 
 int display_init_required(void)
 {
-	/* For vboot, always honor VBOOT_WD_FLAG_DISPLAY_INIT. */
+	/* For vboot, always honor VB2_CONTEXT_DISPLAY_INIT. */
 	if (CONFIG(VBOOT)) {
 		/* Must always select MUST_REQUEST_DISPLAY when using this
 		   function. */
 		if (!CONFIG(VBOOT_MUST_REQUEST_DISPLAY))
 			dead_code();
-		return vboot_get_working_data()->flags
-			& VBOOT_WD_FLAG_DISPLAY_INIT;
+		return vboot_get_context()->flags & VB2_CONTEXT_DISPLAY_INIT;
 	}
 
 	/* By default always initialize display. */
diff --git a/src/security/vboot/bootmode.c b/src/security/vboot/bootmode.c
index 0ab0431f46..bc89e732cf 100644
--- a/src/security/vboot/bootmode.c
+++ b/src/security/vboot/bootmode.c
@@ -148,8 +148,8 @@ int vboot_recovery_mode_memory_retrain(void)
 
 int vboot_developer_mode_enabled(void)
 {
-	return cbmem_possibly_online() &&
-		vboot_get_working_data()->flags & VBOOT_WD_FLAG_DEVELOPER_MODE;
+	return vboot_logic_executed() &&
+		vboot_get_context()->flags & VB2_CONTEXT_DEVELOPER_MODE;
 }
 
 #if CONFIG(VBOOT_NO_BOARD_SUPPORT)
diff --git a/src/security/vboot/misc.h b/src/security/vboot/misc.h
index b45fc9c60d..455773cc7c 100644
--- a/src/security/vboot/misc.h
+++ b/src/security/vboot/misc.h
@@ -37,20 +37,11 @@ struct selected_region {
  */
 struct vboot_working_data {
 	struct selected_region selected_region;
-	uint32_t flags;
 	/* offset of the buffer from the start of this struct */
 	uint16_t buffer_offset;
 	uint16_t buffer_size;
 };
 
-/*
- * Definitions for vboot_working_data.flags values.
- */
-/* vboot requests display initialization from coreboot. */
-#define VBOOT_WD_FLAG_DISPLAY_INIT (1 << 0)
-/* vboot has selected developer mode. */
-#define VBOOT_WD_FLAG_DEVELOPER_MODE (1 << 1)
-
 /*
  * Source: security/vboot/common.c
  */
diff --git a/src/security/vboot/vboot_logic.c b/src/security/vboot/vboot_logic.c
index 511014711d..c4389a9bc1 100644
--- a/src/security/vboot/vboot_logic.c
+++ b/src/security/vboot/vboot_logic.c
@@ -376,14 +376,6 @@ void verstage_main(void)
 	printk(BIOS_INFO, "Phase 1\n");
 	rv = vb2api_fw_phase1(ctx);
 
-	/* Jot down some information from vboot which may be required later on
-	   in coreboot boot flow. */
-	if (ctx->flags & VB2_CONTEXT_DISPLAY_INIT)
-		/* Mainboard/SoC should initialize display. */
-		vboot_get_working_data()->flags |= VBOOT_WD_FLAG_DISPLAY_INIT;
-	if (ctx->flags & VB2_CONTEXT_DEVELOPER_MODE)
-		vboot_get_working_data()->flags |= VBOOT_WD_FLAG_DEVELOPER_MODE;
-
 	if (rv) {
 		/*
 		 * If vb2api_fw_phase1 fails, check for return value.