diff options
| author | Joel Kitching <kitching@google.com> | 2019-05-29 15:22:54 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-06-07 20:09:44 +0000 |
| commit | 451813ef0c12ebf31b68e7a29c2752d882879ab6 (patch) | |
| tree | 65fe8c3e0f7a125c258715ae04678c2de57dc574 /tests/vboot_api_kernel4_tests.c | |
| parent | efd0dc23e855c8ec5a4cd4e0bb08b4ae1e40bfb3 (diff) | |
| download | vboot-451813ef0c12ebf31b68e7a29c2752d882879ab6.tar.gz | |
vboot: don't use VB2_NV_DISPLAY_REQUEST for diagnostic mode
Display initialization code now directly checks
VB2_NV_DIAG_REQUEST. There is no need for diagnostic mode flow
to set VB2_NV_DISPLAY_REQUEST.
BUG=b:124141368, chromium:948592, chromium:967298, b:133175864
TEST=make clean && make runtests
BRANCH=none
Change-Id: I9748bf03c11c5698c181c177634d73fb34fd2d59
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1634452
Commit-Queue: Jason Clinton <jclinton@chromium.org>
Tested-by: Jason Clinton <jclinton@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'tests/vboot_api_kernel4_tests.c')
| -rw-r--r-- | tests/vboot_api_kernel4_tests.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/tests/vboot_api_kernel4_tests.c b/tests/vboot_api_kernel4_tests.c index b3b34022..5d4370c0 100644 --- a/tests/vboot_api_kernel4_tests.c +++ b/tests/vboot_api_kernel4_tests.c @@ -266,27 +266,11 @@ static void VbSlkTest(void) ResetMocks(); mock_switches[1] = VB_SWITCH_FLAG_PHYS_PRESENCE_PRESSED; vb2_nv_set(&ctx_nvram_backend, VB2_NV_DIAG_REQUEST, 1); - vb2_nv_set(&ctx_nvram_backend, VB2_NV_DISPLAY_REQUEST, 1); vbboot_retval = -4; test_slk(VBERROR_SIMULATED, 0, - "Normal boot with diag - display available"); + "Normal boot with diag"); TEST_EQ(vb2_nv_get(&ctx_nvram_backend, VB2_NV_DIAG_REQUEST), 0, " diag not requested"); - TEST_EQ(vb2_nv_get(&ctx_nvram_backend, VB2_NV_DISPLAY_REQUEST), - 0, " DISPLAY_REQUEST disabled"); - - ResetMocks(); - mock_switches[1] = VB_SWITCH_FLAG_PHYS_PRESENCE_PRESSED; - vb2_nv_set(&ctx_nvram_backend, VB2_NV_DIAG_REQUEST, 1); - vb2_nv_set(&ctx_nvram_backend, VB2_NV_DISPLAY_REQUEST, 0); - sd->flags &= ~VB2_SD_FLAG_DISPLAY_AVAILABLE; - vbboot_retval = -4; - test_slk(VBERROR_REBOOT_REQUIRED, 0, - "Normal boot with diag - display unavailable"); - TEST_EQ(vb2_nv_get(&ctx_nvram_backend, VB2_NV_DIAG_REQUEST), - 1, " diag requested"); - TEST_EQ(vb2_nv_get(&ctx_nvram_backend, VB2_NV_DISPLAY_REQUEST), - 1, " DISPLAY_REQUEST needed"); } /* Boot dev */ |