From 89a517730f0207dbef9b3ff219d360904dca456e Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 8 Apr 2018 23:26:57 -0400 Subject: Add support for booting into alternative boot loaders Add a generic way of selecting an alternative bootloader to run from the developer-mode menu. This enables keys 1-9 to select a particular numbered bootloader. Adjust VbExLegacy() to take a numeric parameter to signal which boot loader to run. CQ-DEPEND=CL:1228875 BUG=chromium:837018 BRANCH=none TEST=FEATURES=test emerge-grunt --nodeps vboot_reference Change-Id: I02eab1b87e21a6401ec42317c4c1fa1bd2767b53 Signed-off-by: Simon Glass Reviewed-on: https://chromium-review.googlesource.com/1060854 Reviewed-by: Julius Werner --- tests/vboot_api_kernel2_tests.c | 53 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) (limited to 'tests/vboot_api_kernel2_tests.c') diff --git a/tests/vboot_api_kernel2_tests.c b/tests/vboot_api_kernel2_tests.c index 11c4c2f6..f9d061f8 100644 --- a/tests/vboot_api_kernel2_tests.c +++ b/tests/vboot_api_kernel2_tests.c @@ -36,6 +36,7 @@ static int shutdown_request_calls_left; static int audio_looping_calls_left; static uint32_t vbtlk_retval; static int vbexlegacy_called; +static int altfw_num; static int trust_ec; static int virtdev_set; static uint32_t virtdev_retval; @@ -76,6 +77,7 @@ static void ResetMocks(void) audio_looping_calls_left = 30; vbtlk_retval = 1000; vbexlegacy_called = 0; + altfw_num = -1; trust_ec = 0; virtdev_set = 0; virtdev_retval = 0; @@ -132,9 +134,11 @@ uint32_t VbExGetSwitches(uint32_t request_mask) return 0; } -int VbExLegacy(void) +int VbExLegacy(int _altfw_num) { vbexlegacy_called++; + altfw_num = _altfw_num; + return 0; } @@ -271,6 +275,8 @@ static void VbBootTest(void) static void VbBootDevTest(void) { + int key; + printf("Testing VbBootDeveloper()...\n"); /* Proceed after timeout */ @@ -290,6 +296,15 @@ static void VbBootDevTest(void) VB2_GBB_FLAG_FORCE_DEV_BOOT_LEGACY; TEST_EQ(VbBootDeveloper(&ctx), 1002, "Timeout"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); + TEST_EQ(altfw_num, 0, " check altfw_num"); + + /* Proceed to legacy after timeout if GBB flag set */ + ResetMocks(); + sd->gbb_flags |= VB2_GBB_FLAG_DEFAULT_DEV_BOOT_LEGACY | + VB2_GBB_FLAG_FORCE_DEV_BOOT_LEGACY; + TEST_EQ(VbBootDeveloper(&ctx), 1002, "Timeout"); + TEST_EQ(vbexlegacy_called, 1, " try legacy"); + TEST_EQ(altfw_num, 0, " check altfw_num"); /* Proceed to legacy after timeout if boot legacy and default boot * legacy are set */ @@ -299,6 +314,7 @@ static void VbBootDevTest(void) vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_LEGACY, 1); TEST_EQ(VbBootDeveloper(&ctx), 1002, "Timeout"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); + TEST_EQ(altfw_num, 0, " check altfw_num"); /* Proceed to legacy boot mode only if enabled */ ResetMocks(); @@ -463,6 +479,7 @@ static void VbBootDevTest(void) TEST_EQ(VbBootDeveloper(&ctx), 1002, "Ctrl+L force legacy"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); + TEST_EQ(altfw_num, 0, " check altfw_num"); ResetMocks(); vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_LEGACY, 1); @@ -470,6 +487,7 @@ static void VbBootDevTest(void) TEST_EQ(VbBootDeveloper(&ctx), 1002, "Ctrl+L nv legacy"); TEST_EQ(vbexlegacy_called, 1, " try legacy"); + TEST_EQ(altfw_num, 0, " check altfw_num"); ResetMocks(); VbApiKernelGetFwmp()->flags |= FWMP_DEV_ENABLE_LEGACY; @@ -477,6 +495,39 @@ static void VbBootDevTest(void) TEST_EQ(VbBootDeveloper(&ctx), 1002, "Ctrl+L fwmp legacy"); TEST_EQ(vbexlegacy_called, 1, " fwmp legacy"); + TEST_EQ(altfw_num, 0, " check altfw_num"); + + /* Pressing 1-9 boots alternative firmware only if enabled */ + for (key = '1'; key <= '9'; key++) { + ResetMocks(); + mock_keypress[0] = key; + TEST_EQ(VbBootDeveloper(&ctx), 1002, "'1' normal"); + TEST_EQ(vbexlegacy_called, 0, " not legacy"); + + ResetMocks(); + sd->gbb_flags |= VB2_GBB_FLAG_FORCE_DEV_BOOT_LEGACY; + mock_keypress[0] = key; + TEST_EQ(VbBootDeveloper(&ctx), 1002, + "Ctrl+L force legacy"); + TEST_EQ(vbexlegacy_called, 1, " try legacy"); + TEST_EQ(altfw_num, key - '0', " check altfw_num"); + + ResetMocks(); + vb2_nv_set(&ctx, VB2_NV_DEV_BOOT_LEGACY, 1); + mock_keypress[0] = key; + TEST_EQ(VbBootDeveloper(&ctx), 1002, + "Ctrl+L nv legacy"); + TEST_EQ(vbexlegacy_called, 1, " try legacy"); + TEST_EQ(altfw_num, key - '0', " check altfw_num"); + + ResetMocks(); + VbApiKernelGetFwmp()->flags |= FWMP_DEV_ENABLE_LEGACY; + mock_keypress[0] = key; + TEST_EQ(VbBootDeveloper(&ctx), 1002, + "Ctrl+L fwmp legacy"); + TEST_EQ(vbexlegacy_called, 1, " fwmp legacy"); + TEST_EQ(altfw_num, key - '0', " check altfw_num"); + } /* Ctrl+U boots USB only if enabled */ ResetMocks(); -- cgit v1.2.1