From 5f267372c661572ca5173c71962cc5162e2f3e2d Mon Sep 17 00:00:00 2001 From: Yu-Ping Wu Date: Mon, 3 Feb 2020 16:29:29 +0800 Subject: vboot: Reduce unnecessary redraw of error message When developer mode is disabled by the VB2_SECDATA_FWMP_DEV_DISABLE_BOOT flag, the error message will be redrawn per 20 ms even if no key is pressed. This patch reduces unnecessary redraw by moving the drawing inside enter_to_norm_menu(), which will be called only when changing screens. BRANCH=kukui BUG=chromium:1048094,chromium:1049029 TEST=emerge-nami vboot_reference Cq-Depend: chromium:2040844 Change-Id: I0e892086b25fc94800534c5a37bcab8b70a5fcd9 Signed-off-by: Yu-Ping Wu Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2035056 Reviewed-by: Joel Kitching Reviewed-by: Julius Werner (cherry picked from commit 87c7b1b55155a91cd22a1e93343064d65d6aad97) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2043781 --- firmware/lib/vboot_ui_menu.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/firmware/lib/vboot_ui_menu.c b/firmware/lib/vboot_ui_menu.c index b932ce9e..567742be 100644 --- a/firmware/lib/vboot_ui_menu.c +++ b/firmware/lib/vboot_ui_menu.c @@ -275,6 +275,9 @@ static vb2_error_t enter_to_norm_menu(struct vb2_context *ctx) { vb2_change_menu(VB_MENU_TO_NORM, VB_TO_NORM_CONFIRM); vb2_draw_current_screen(ctx); + /* Make sure user knows dev mode disabled */ + if (disable_dev_boot) + VbExDisplayDebugInfo(dev_disable_msg, 0); return VBERROR_KEEP_LOOPING; } @@ -772,10 +775,6 @@ static vb2_error_t vb2_developer_menu(struct vb2_context *ctx) do { uint32_t key = VbExKeyboardRead(); - /* Make sure user knows dev mode disabled */ - if (disable_dev_boot) - VbExDisplayDebugInfo(dev_disable_msg, 0); - switch (key) { case VB_BUTTON_VOL_DOWN_LONG_PRESS: case VB_KEY_CTRL('D'): -- cgit v1.2.1