From eea0116590ccf332b75b589b1f3f64ffb55d3fb5 Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Wed, 20 Jan 2016 12:53:15 -0800 Subject: [PATCH] vboot: Disable VBNV_OPROM_NEEDED after successful update The VBOOT_OPROM_NEEDED flag is used for EC software sync when the VBSD_EC_SLOW_UPDATE flag is set. After a successful EC software sync vboot requests a reboot to disable graphics but it is not clearing the VBNV flag first. With vboot1 this was getting cleared as a side effect of calling VbInit in normal mode. BUG=chrome-os-partner:49560 BRANCH=glados TEST=Enable EC_SLOW_UPDATE on chell and test EC software sync in normal mode and ensure that it reboots and does not do graphics init if the update is successful. Change-Id: I2aa0c4c3b1ad357a5b8ddc14539e264a1f5b76b2 Signed-off-by: Duncan Laurie Reviewed-on: https://chromium-review.googlesource.com/322731 Reviewed-by: Aaron Durbin --- firmware/lib/vboot_api_kernel.c | 1 + 1 file changed, 1 insertion(+) diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c index 3cc150b430..fff30561cf 100644 --- a/firmware/lib/vboot_api_kernel.c +++ b/firmware/lib/vboot_api_kernel.c @@ -1052,6 +1052,7 @@ VbError_t VbEcSoftwareSync(int devidx, VbCommonParams *cparams) (shared->flags & VBSD_OPROM_LOADED)) { VBDEBUG(("VbEcSoftwareSync() - Reboot to " "unload VGA Option ROM\n")); + VbNvSet(&vnc, VBNV_OPROM_NEEDED, 0); return VBERROR_VGA_OPROM_MISMATCH; }