From ed23c08440dae6657d026a30b504578e03e0426f Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Fri, 10 Jul 2020 14:17:18 -0700 Subject: Reset EC when transitioning to dev mode Currently, we reboot the AP (a.k.a. warm-reboot) to transition to dev mode in legacy_menu_ui; and reboot the EC (a.k.a. cold-reboot) in menu_ui and legacy_clamshell_ui. This patch makes legacy_menu_ui also reboot the EC. BUG=b:154228771 BRANCH=none TEST=make runtests Signed-off-by: Daisuke Nojiri Change-Id: Ie48c8ef5e8744102c8dbafb7929523c54b14d81d Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2293050 Reviewed-by: Joel Kitching --- firmware/lib/vboot_ui_legacy_menu.c | 2 +- tests/vboot_ui_legacy_menu_tests.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/firmware/lib/vboot_ui_legacy_menu.c b/firmware/lib/vboot_ui_legacy_menu.c index c11e845f..f5165ad7 100644 --- a/firmware/lib/vboot_ui_legacy_menu.c +++ b/firmware/lib/vboot_ui_legacy_menu.c @@ -396,7 +396,7 @@ static vb2_error_t to_dev_action(struct vb2_context *ctx) vb2_enable_developer_mode(ctx); - return VB2_REQUEST_REBOOT; + return VB2_REQUEST_REBOOT_EC_TO_RO; } /* Action that disables developer mode, shows TO_NORM_CONFIRMED and reboots. */ diff --git a/tests/vboot_ui_legacy_menu_tests.c b/tests/vboot_ui_legacy_menu_tests.c index fee6a3f9..1dc92535 100644 --- a/tests/vboot_ui_legacy_menu_tests.c +++ b/tests/vboot_ui_legacy_menu_tests.c @@ -1644,7 +1644,7 @@ static void VbBootRecTest(void) mock_keyflags[i] = VB_KEY_FLAG_TRUSTED_KEYBOARD; mock_keypress[i++] = VB_BUTTON_VOL_UP_SHORT_PRESS; mock_keypress[i++] = VB_BUTTON_POWER_SHORT_PRESS; - TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_REBOOT, + TEST_EQ(VbBootRecoveryLegacyMenu(ctx), VB2_REQUEST_REBOOT_EC_TO_RO, "go to TO_DEV screen and confirm"); TEST_EQ(vb2_nv_get(ctx, VB2_NV_RECOVERY_REQUEST), 0, " no recovery"); TEST_EQ(debug_info_displayed, 0, " no debug info"); -- cgit v1.2.1