delta/coreboot/vboot.git, branch release-R64-10176.B

detachables: create menu items for legacy screens

2017-11-23T12:39:15+00:00

Previously, we didn't require any action on these legacy screens, so
didn't update current_screen when displaying these.  Now, will be
adding language switching and debug display for these screens, so need
to keep track of them.

BUG=b:65470853, b:67371896, b:64400036
BRANCH=None
TEST=None

Change-Id: I2bab22fcbb0bb3cdfffe585eb633231ba8015fc3
Signed-off-by: Shelley Chen 
Reviewed-on: https://chromium-review.googlesource.com/676269
Commit-Ready: ChromeOS CL Exonerator Bot 
Reviewed-by: Randall Spangler

Fix vboot compilation with coreboot-sdk

2017-11-21T02:13:45+00:00

BUG=none
BRANCH=none
TEST=Upstream builder does not fail with uninitialized variable anymore like this:
 firmware/lib/vboot_ui_menu.c: In function 'vb2_get_current_menu_size':
 firmware/lib/vboot_ui_menu.c:255:15: error: 'temp_menu' may be used uninitialized in this function [-Werror=maybe-uninitialized]
    *menu_array = temp_menu;
    ~~~~~~~~~~~~^~~~~~~~~~~
 cc1: all warnings being treated as errors

Signed-off-by: Stefan Reinauer 

Change-Id: Idb1690c7b0becf3556cad379160fe152707ae843
Reviewed-on: https://chromium-review.googlesource.com/777805
Commit-Ready: Stefan Reinauer 
Tested-by: Stefan Reinauer 
Reviewed-by: Martin Roth 
Reviewed-by: Shelley Chen

vboot: Use kernel max rollforward NV storage field

2017-11-18T04:18:20+00:00

Kernel verification will now roll forward the minimum allowable
version in the TPM no farther than the kernel_max_rollforward setting.

Note that CL:765573 changes chromeos-setgoodkernel so it always sets
kernel_max_rollforward to 0xfffffffe when marking a kernel as good.
That ensures that firmware with this setting will behave the same for
now as existing firmware.

BUG=chromium:783997
BRANCH=none
CQ-DEPEND=CL:765573
TEST=make runtests
     Manual testing:
     crossystem tpm_kernvel --> print current kernel version in TPM
     - Resign the kernel with a higher version
     - Reboot
     - Wait a minute for chromeos-setgoodkernel to run
     crossystem kernel_max_rollforward=0
     - Reboot
     crossystem tpm_kernvel --> has not changed
     - Wait a minute for chromeos-setgoodkernel to run
     crossystem kernel_max_rollforward -> 0xfffffffe
     - Reboot
     crossystem tpm_kernvel --> has changed to the higher version

Change-Id: Ia32ecb7fa4078548cd311541ccbe120570cf1bc5
Reviewed-on: https://chromium-review.googlesource.com/765574
Commit-Ready: Randall Spangler 
Tested-by: Randall Spangler 
Reviewed-by: Julius Werner 
Reviewed-by: Stefan Reinauer

nvstorage: Add kernel max rollforward NV storage field

2017-11-18T04:18:19+00:00

This just adds the kernel_max_rollforward field to the nvstorage
libraries and crossystem.  The firmware does not use it yet; that's
coming in a subsequent CL.

16 of the fields's 32 bits are taken from unused bytes of the kernel
field.  This has no effect on existing usage.

BUG=chromium:783997
BRANCH=none
TEST=make runtests
     Also manual testing.  In a root shell:
     	crossystem kernel_max_rollforward --> Should default to 0

	crossystem kernel_max_rollforward=0xfffffffe
	crossystem kernel_max_rollforward --> Should be 0xfffffffe

     (Note that setting it to 0xffffffff is indistinguishable from the
     -1 value that the crossystem library uses to indicate error, so
     0xffffffff isn't actually usable as a max rollforward limit.  But
     0xfffffffe is, and if we ever get so close to the limit that we
     need to use 0xffffffff, something has already gone horribly wrong
     with our versioning strategy...)

Change-Id: I008f412e6ed3c0b59beb9881268585af69d1ff2e
Signed-off-by: Randall Spangler 
Reviewed-on: https://chromium-review.googlesource.com/765572
Reviewed-by: Julius Werner

detachables: Use Volup+Voldown to exit recovery graphic

2017-11-16T16:28:12+00:00

Previously, we were able to exit the initial recovery graphic with
either the volume up or volume down button.  However, we would only
like the user to exit the screen when they know what they are doing,
we are making it so that they can only intentionally exit (with volup
+ voldown simultaneously pressed).

BUG=b:67371896
BRANCH=None
TEST=reboot into recovery and press volume up + volume down keys.
     Make sure we exit to the recovery menu screen.

Change-Id: I7dfb4a0e42c8b88e9b075e886cea1adfe248246c
Signed-off-by: Shelley Chen 
Reviewed-on: https://chromium-review.googlesource.com/766847
Reviewed-by: Julius Werner

detachables: Implement disable dev mode for enterprise

2017-11-16T16:28:12+00:00

When develper mode is disabled (through FWMP), don't allow user to see
the dev warning screen.  Boot straight to TO_NORM and disable the
cancel option.  Basically, the user will only be able to enable OS
verification, power off, or change the language.  There is also no 30
second timeout during bootup.

BUG=b:65595945
BRANCH=None
TEST=Force disable_dev_boot flag to 1 and ensure the TO_NORM menu is
     displayed w/o a cancel option.  Scroll through options to make
     sure they work as expected.  Make sure debug message is displayed
     indicating dev mode is disabled.  Wait > 30 secs to ensure
     timeout doesn't occur.

Change-Id: I7d2bcd369694e886866f9dedff05d81a40f8270a
Signed-off-by: Shelley Chen 
Reviewed-on: https://chromium-review.googlesource.com/757115
Reviewed-by: Julius Werner

EC-EFS: Fix in-place signature replacement

2017-11-15T00:03:22+00:00

When futility replaces the old signature in the input file with a
new one, it assumes the signature is at the end of RW region. This
assumption is wrong for EC-EFS binaries because they place a
signature at each end of two EC_RW areas.

This patch fixes the issue by specifying the signature address via
'old_sig', which points to the (first) signature address regardless
of the input file format (EFS v.s. non-EFS, FMAP v.s. no FMAP).

BUG=b:66956286
BRANCH=none
TEST=Run
'futility sign --type rwsig --prikey key_ec_efs.vbprik2 ec.bin'.
Then run 'futility show --type rwsig ec.bin', which prints
'Signature verification succeeded.'
make runtests

Change-Id: I730fd31be640de3e9381f156d084162dd4093ba6
Signed-off-by: Daisuke Nojiri 
Reviewed-on: https://chromium-review.googlesource.com/767596

vboot_ui_menu: Use volume down short press at recovery menu screen

2017-11-14T18:11:19+00:00

Fix the typo made in
https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/757123
for usage of volume down button at recovery menu screen. It should be
short press instead of long press.

BUG=b:64992445,b:65013794
BRANCH=None
TEST=Verified that volume down short press works as expected on
recovery menu.

Change-Id: Ia9a172439ac3bbd1ea395778e83a95c988816e01
Signed-off-by: Furquan Shaikh 
Reviewed-on: https://chromium-review.googlesource.com/767059
Reviewed-by: Shelley Chen

vboot: use VBNV_ constants with VbNvGet()

2017-11-12T18:49:49+00:00

The vboot1 library VbNvGet() / VbNvSet() functions use enum VbNvParam
(VBNV_*) constants.

The vboot2 library vb2_nv_get() / vb2_nv_set() functions use enum
vb2_nv_param constants.

Do not mix the two.  In the one instance where this happens in the
current code, we get lucky, because VBNV_DEV_BOOT_FASTBOOT_FULL_CAP
and VB2_NV_DEV_BOOT_FASTBOOT_FULL_CAP evaluate to the same value, so
this was harmless.  But fix that now so nobody else copy/pastes that
pattern for a param where this isn't true.

BUG=none
BRANCH=none
TEST=make runtests

Change-Id: I1facbe1d97591dc8b1e6b38717924b884949da57
Signed-off-by: Randall Spangler 
Reviewed-on: https://chromium-review.googlesource.com/764970
Reviewed-by: Julius Werner

buttons: Update button codes for vup, vdn and power

2017-11-10T05:45:56+00:00

1. Differentiate button codes for short press and long press of volume
up and volume down.
2. Add a new code for volume up-down combo press since it is expected
to be used for one of the firmware screens.
3. Treat volume down long press as Ctrl-D on developer screen.
4. Treat volume up long press as Ctrl-U on developer screen.

CQ-DEPEND=CL:756254
BUG=b:64992445,b:65013794
BRANCH=None
TEST=Verified that buttons work as expected on Soraka.

Change-Id: I5d443f43f785b973f3ff4aeaac52b152ed2fe0bd
Signed-off-by: Furquan Shaikh 
Reviewed-on: https://chromium-review.googlesource.com/757123
Reviewed-by: Aaron Durbin