From fe2fc8393632c90b17b9415bdc496d9c38b1f156 Mon Sep 17 00:00:00 2001 From: Hung-Te Lin Date: Thu, 29 Dec 2016 20:59:37 +0800 Subject: vboot: Clear battery cutoff flags when vbnv_cmos loads backup VBNV. When CONFIG_VBOOT_VBNV_CMOS_BACKUP_TO_FLASH is set, vbnv_cmos will try to load VBNV from flash if the VBNV in CMOS is invalid. This is usually correct, except the case of battery cut-off. CMOS will always be invalid after battery cut-off if there is no RTC battery (or if that is dead). However, in current implementation the backup in flash is only updated in coreboot, while the real battery cutoff (and the clearing of cutoff flags in VBNV) is done in payload (Depthcharge) stage. This will create an endless reboot loop that: 1. crossystem sets battery cutoff flag in VBNV_CMOS then reboot. 2. coreboot backs-up VBNV_CMOS to VBNV_flash. 3. Depthcharge sees cutoff flag in VBNV_CMOS. 4. Depthcharge clears cutoff flag in VBNV_CMOS. 5. Depthcharge performs battery cutoff (CMOS data is lost). 6. (Plug AC adapter) Reboot. 7. Coreboot sees invalid VBNV_CMOS, load backup from VBNV_flash. 8. Jump to 3. As a result, we should always clear battery cutoff flags when loading backups from VBNV_flash. BRANCH=glados,reef BUG=chrome-os-partner:61365,chrome-os-partner:59615 TEST=emerge-reef coreboot bootimage; Change-Id: I3250a3a179a7b0de9c6e401e4a94dcd23920e473 Signed-off-by: Hung-Te Lin Reviewed-on: https://chromium-review.googlesource.com/423460 Reviewed-by: Duncan Laurie Reviewed-on: https://review.coreboot.org/18008 Reviewed-by: Paul Menzel Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/vboot/vbnv_layout.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/vboot/vbnv_layout.h') diff --git a/src/vboot/vbnv_layout.h b/src/vboot/vbnv_layout.h index 59acd0c354..1dc01c909a 100644 --- a/src/vboot/vbnv_layout.h +++ b/src/vboot/vbnv_layout.h @@ -41,6 +41,9 @@ #define DEV_BOOT_USB_MASK 0x01 #define DEV_BOOT_SIGNED_ONLY_MASK 0x02 +#define MISC_FLAGS_OFFSET 8 +#define MISC_FLAGS_BATTERY_CUTOFF_MASK 0x08 + #define KERNEL_FIELD_OFFSET 11 #define CRC_OFFSET 15 -- cgit v1.2.3