diff options
author | Hung-Te Lin <hungte@chromium.org> | 2016-04-07 12:21:03 +0800 |
---|---|---|
committer | ChromeOS bot <3su6n15k.default@developer.gserviceaccount.com> | 2016-04-13 17:26:07 +0000 |
commit | 4bc9906f35507cb332456cb69f883fad4cdfcba2 (patch) | |
tree | cb9c968aa29832ac0d137a73a48406f5d7271ef1 /host/lib/crossystem.c | |
parent | 37ae160e51581fd51f84ac478645251412f5ea86 (diff) | |
download | vboot-firmware-glados-7820.315.B.tar.gz |
Support doing battery cut-off in firmware stage.firmware-glados-7820.Bfirmware-glados-7820.315.B
Add a new crossystem value "battery_cutoff_request" to indicate that
next reboot should cut-off battery and shutdown during firmware stage.
This request is primarily for factories to ship devices in an safe
state. Previously we have done same thing by running "ectool battery-cutoff"
but that creates a problem which "ectool" (and the one to request for
cut-off) must live in developer mode while the device must be shipped
in normal mode. The mode transition was solved by setting
"disable_dev_request=1", but that flag is may get lost on x86 systems
(having NV storage in CMOS) when the battery is cut-off .
From the experience from Ryu, such settings (dev mode transition and
battery cut-off) should be done together inside firmware execution so we
can create a new flag, battery_cutoff_request, to finalize device
properly.
BRANCH=none
BUG=chromium:601705
TEST=emerge-chell depthcharge vboot_reference chromeos-bootimage
crossystem battery_cutoff_request=1
# Unplug AC adapter
reboot
# See device rebooted and then shutdown immediately.
# Press power button and system won't boot.
# Attach AC adapter and now system boots.
CQ-DEPEND=CL:338288,CL:338399
Original-Change-Id: I73ccae15b337cd65786106646546c67c155b8fa6
Original-Reviewed-on: https://chromium-review.googlesource.com/337602
Commit-Ready: Hung-Te Lin <hungte@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
(cherry picked from commit aee6bd69fefac653cfc4a5679eb387d7c3280d14)
Change-Id: I563602ee8437f867720942df7f658a28378579aa
Reviewed-on: https://chromium-review.googlesource.com/338178
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Tested-by: Duncan Laurie <dlaurie@chromium.org>
Commit-Queue: Duncan Laurie <dlaurie@chromium.org>
Diffstat (limited to 'host/lib/crossystem.c')
-rw-r--r-- | host/lib/crossystem.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/host/lib/crossystem.c b/host/lib/crossystem.c index fd5cd9eb..3d2a908f 100644 --- a/host/lib/crossystem.c +++ b/host/lib/crossystem.c @@ -542,6 +542,8 @@ int VbGetSystemPropertyInt(const char* name) { value = VbGetNvStorage(VBNV_BOOT_ON_AC_DETECT); } else if (!strcasecmp(name, "try_ro_sync")) { value = VbGetNvStorage(VBNV_TRY_RO_SYNC); + } else if (!strcasecmp(name, "battery_cutoff_request")) { + value = VbGetNvStorage(VBNV_BATTERY_CUTOFF_REQUEST); } return value; @@ -678,6 +680,8 @@ int VbSetSystemPropertyInt(const char* name, int value) { return VbSetNvStorage_WithBackup(VBNV_BOOT_ON_AC_DETECT, value); } else if (!strcasecmp(name, "try_ro_sync")) { return VbSetNvStorage_WithBackup(VBNV_TRY_RO_SYNC, value); + } else if (!strcasecmp(name, "battery_cutoff_request")) { + return VbSetNvStorage(VBNV_BATTERY_CUTOFF_REQUEST, value); } return -1; |