GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Yu-Ping Wu 2019-11-13 15:57:45 +08:00 committed by Patrick Georgi
parent 2332c7459e
commit 9fc8cf89e8
4 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/bootmode.c
View File

@ -16,6 +16,7 @@
#include <assert.h> #include <assert.h>
#include <bootmode.h> #include <bootmode.h>
#include <security/vboot/misc.h> #include <security/vboot/misc.h>
#include <vb2_api.h>
static int gfx_init_done = -1; static int gfx_init_done = -1;
@ -33,14 +34,13 @@ void gfx_set_init_done(int done)
int display_init_required(void) 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)) { if (CONFIG(VBOOT)) {
/* Must always select MUST_REQUEST_DISPLAY when using this /* Must always select MUST_REQUEST_DISPLAY when using this
function. */ function. */
if (!CONFIG(VBOOT_MUST_REQUEST_DISPLAY)) if (!CONFIG(VBOOT_MUST_REQUEST_DISPLAY))
dead_code(); dead_code();
return vboot_get_working_data()->flags return vboot_get_context()->flags & VB2_CONTEXT_DISPLAY_INIT;
& VBOOT_WD_FLAG_DISPLAY_INIT;
} }
/* By default always initialize display. */ /* By default always initialize display. */

4
src/security/vboot/bootmode.c
View File

@ -148,8 +148,8 @@ int vboot_recovery_mode_memory_retrain(void)
int vboot_developer_mode_enabled(void) int vboot_developer_mode_enabled(void)
{ {
return cbmem_possibly_online() && return vboot_logic_executed() &&
vboot_get_working_data()->flags & VBOOT_WD_FLAG_DEVELOPER_MODE; vboot_get_context()->flags & VB2_CONTEXT_DEVELOPER_MODE;
} }
#if CONFIG(VBOOT_NO_BOARD_SUPPORT) #if CONFIG(VBOOT_NO_BOARD_SUPPORT)

9
src/security/vboot/misc.h
View File

@ -37,20 +37,11 @@ struct selected_region {
*/ */
struct vboot_working_data { struct vboot_working_data {
struct selected_region selected_region; struct selected_region selected_region;
uint32_t flags;
/* offset of the buffer from the start of this struct */ /* offset of the buffer from the start of this struct */
uint16_t buffer_offset; uint16_t buffer_offset;
uint16_t buffer_size; 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 * Source: security/vboot/common.c
*/ */

8
src/security/vboot/vboot_logic.c
View File

@ -376,14 +376,6 @@ void verstage_main(void)
printk(BIOS_INFO, "Phase 1\n"); printk(BIOS_INFO, "Phase 1\n");
rv = vb2api_fw_phase1(ctx); 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 (rv) {
/* /*
* If vb2api_fw_phase1 fails, check for return value. * If vb2api_fw_phase1 fails, check for return value.