delta/coreboot/vboot.git, branch release-R97-14324.B

ui: Add VB2_UI_ERROR_MINIOS_BOOT_FAILED

2021-10-29T04:36:41+00:00

Add a new error type VB2_UI_ERROR_MINIOS_BOOT_FAILED for MiniOS boot
failure.

BUG=b:200750322
TEST=emerge-cherry depthcharge
BRANCH=none

Change-Id: Ia567c9ec735e7aae830ad311b2261e01fed53876
Signed-off-by: Yu-Ping Wu 
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3249590
Reviewed-by: Hsuan Ting Chen 
Reviewed-by: Jae Hoon Kim

COIL: Remove "slave"

2021-10-29T03:53:46+00:00

In the context of device mapper (dm), use "mapped device".

BUG=b:179221734
TEST=make runtests
BRANCH=none

Change-Id: I9245d8482e59db93bfe6cdcaafa503038ae5c9e3
Signed-off-by: Yu-Ping Wu 
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3246662
Reviewed-by: Chen-Yu Tsai 
Reviewed-by: Hung-Te Lin

vboot_reference/futility: Split load_firmware_image() fn

2021-10-28T11:06:15+00:00

This is in prep for removing the need for temp files.

V.2:
 Move validation into parse_firmware_image()

BUG=b:203715651
BRANCH=none
TEST=cros deploy to nocturne and ran:
 `/usr/sbin/chromeos-firmware --mode=recovery`.

Signed-off-by: Edward O'Callaghan 
Change-Id: Id61fcb0f53546a78085e0a367c21780c5885bc51
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3244679
Commit-Queue: Edward O'Callaghan 
Commit-Queue: Sam McNally 
Tested-by: Edward O'Callaghan 
Auto-Submit: Edward O'Callaghan 
Reviewed-by: Sam McNally

OWNERS: Replace furquan with twawrzynczak

2021-10-22T17:15:07+00:00

BUG=None
BRANCH=None
TEST=None

Change-Id: Id8d14bf0c878ead1b18d27488db0cfa5223652ad
Signed-off-by: Furquan Shaikh 
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3238231
Tested-by: Furquan Shaikh 
Auto-Submit: Furquan Shaikh 
Reviewed-by: Dossym Nurmukhanov 
Commit-Queue: Dossym Nurmukhanov

chromeos-tpm-recovery: Quote local variables

2021-10-19T02:40:27+00:00

The strings in these variables usually don't contain any spaces, but on
some non-Google boards (e.g. Intel RVP) they do, so let's follow the
usual shell style and quote all the things.

BRANCH=none
BUG=b:202870010
TEST=None

Signed-off-by: Julius Werner 
Change-Id: I90fac5c605c38eec704df0241d822a19210bfdf9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3221956
Reviewed-by: Andrey Pronin 
Reviewed-by: Yu-Ping Wu

futility: add subcommand for creating and verifying the RO_GSCVD area

2021-10-18T22:11:41+00:00

The help text of the new subcommand is as follows:

-------
  This utility creates an RO verification space in the Chrome OS AP
  firmware image or allows to validate a previously prepared image
  containing the RO verification space.

  Usage: futilitygscvd PARAMS  []

  Creation of RO Verification space:

  Required PARAMS:
    -R|--ranges        STRING        Comma separated colon delimited
                                       hex tuples :, the
                                       areas of the RO covered by the
                                       signature
    -r|--root_pub_key          The main public key, in .vbpubk
                                       format, used to verify platform
                                       key
    -k|--keyblock              Signed platform public key in
                                       .keyblock format, used for run
                                       time RO verifcation
    -p|--platform_priv         Private platform key in .vbprivk
                                       format, used for signing RO
                                       verification data
  Optional PARAMS:
    [--outfile]        OUTFILE       Output firmware image containing
                                       RO verification information

  Validation of RO Verification space:

     The only required parameter is , if optional
      is given, it is compared to the hash of the body
     of the root key found in .

    -h|--help                        Print this message
-------

When creating GVD section, the sha256 hash of the root public key
payload is printed on stdout, this is the hash to include in the GSC
image to for the root key verification.

Code converting ASCII hex string into binary is refactored into a misc
function.

BRANCH=none
BUG=b:141191727
TEST=testing included the following steps:

   . modified guybrush coreboot to allocate an 8KB RO_GSCVD area in
     FMAP and built a guybrush BIOS image
   . filled GVD space as described in the source file comments
   . verified the created space as described in the source file comments
   . verified AP RO integrity on the GSC size using crrev.com/c/3172256

Change-Id: I51a80be5007a32d5286b93499f71da84f41b3d81
Signed-off-by: Vadim Bendebury 
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3174570
Reviewed-by: Julius Werner

Makefile: add install_dut_test rule

2021-10-18T02:50:54+00:00

Add new rule 'install_dut_test' to deploy dut-specific tests to the
device. Any tests included in the rule will be installed into
/usr/share/vboot/tests/.
Especially vb2_sha256_x86_tests uses sha-ni extension, which might not
be available on some platforms. So it needs to be deployed to the dut
and run there.

BUG=b:162551138
BRANCH=none
TEST=build with modified ebuild on hana & guybrush

Signed-off-by: Kangheui Won 
Change-Id: I9c6e00c8a9aca192ae283560383417c1215c221f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3141250
Reviewed-by: Raul E Rangel

vboot: Support booting from non-active miniOS partition

2021-10-15T09:06:41+00:00

To support booting from the non-active miniOS partition in recovery UI,
add minios_flags argument to VbTryLoadMiniOsKernel. Currently there is
only one flag: VB_MINIOS_FLAG_NON_ACTIVE. When it is set, we will
attempt to boot from the non-active partition only.

BUG=b:200750322
TEST=make runtests
BRANCH=none

Cq-Depend: chromium:3219727
Change-Id: I6221f10c09de2487e89e6113981bc9e9755d67f4
Signed-off-by: Yu-Ping Wu 
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3219901
Reviewed-by: Julius Werner 
Reviewed-by: Jae Hoon Kim

Revert "2lib: Use ctx flag VB2_CONTEXT_EC_TRUSTED instead of vb2ex_ec_trusted"

2021-10-07T20:50:33+00:00

This reverts commit 8aded7005e2830f54cf53b329946cbb1f11548f2.

Reason for revert: b:202258389

Original change's description:
> 2lib: Use ctx flag VB2_CONTEXT_EC_TRUSTED instead of vb2ex_ec_trusted
>
> In vb2api_allow_recovery(), we need to check if EC is trusted for
> booting into manual recovery mode. This was implemented by a function
> vb2ex_ec_trusted() which defined in vboot_reference and implemented in
> depthcharge by reading the corresponding EC_IN_RW GPIO flags.
>
> By introducing new boot mode architecture, coreboot will now calling
> these functions to determine the current boot mode and support the
> similar functionalities about checking if EC is trusted (i.e. EC is not
> in RW).
>
> We leverages the existing ctx flag VB2_CONTEXT_EC_TRUSTED for fulfilling
> this. This flag will be set at coreboot vboot_logic.c:verstage_main()
> and can be used deciding the boot mode in vboot_reference:
> vb2api_fw_phase1() and is cleared while EC jumps to RW (i.e.
> 2ec_sync.c:sync_ec()).
>
> BRANCH=none
> BUG=b:181931817
> TEST=emerge-trogdor coreboot vboot_reference depthcharge
>
> Cq-Depend: chromium:3088889
> Signed-off-by: Hsuan Ting Chen 
> Change-Id: I50f35f48ce75e421094ea21e45c24b82e6e55a6c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3106329
> Reviewed-by: Julius Werner 
> Reviewed-by: Yu-Ping Wu 

Bug: b:181931817
Change-Id: I11ae3b2d71c040dfe45b34f74974845dafa92b42
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3211007
Bot-Commit: Rubber Stamper 
Commit-Queue: Bhanu Prakash Maiya

Revert "2lib/2api: Deprecate vb2ex_ec_trusted()"

2021-10-07T20:50:31+00:00

This reverts commit 7c73bb07fd3ca45ce650b993a9c6a5850ddb2707.

Reason for revert: b:202258389

Original change's description:
> 2lib/2api: Deprecate vb2ex_ec_trusted()
>
> coreboot will support check the EC_IN_RW during verstage_main(), which
> performs the equivalent tasks as vb2ex_ec_trusted().
>
> In the previous CL, we remove the check of vb2ex_ec_trusted(), so the
> whole implementation of this function among vboot_reference and
> depthcharge could be deprecated and removed.
>
> BUG=b:181931817
> BRANCH=none
> TEST=CC=x86_64-pc-linux-gnu-clang;
>      make clean && make runtests
> TEST=emerge coreboot vboot_reference depthcharge
>
> Cq-Depend: chromium:3139956
> Signed-off-by: Hsuan Ting Chen 
> Change-Id: I4f592d7dec2480475762e1336791cbb34fa143ba
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3139539
> Reviewed-by: Julius Werner 
> Reviewed-by: Yu-Ping Wu 

Bug: b:181931817
Change-Id: Ia127ce89b7f9413db9fd6ca4561ad06efb36d7e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3211006
Bot-Commit: Rubber Stamper 
Commit-Queue: Bhanu Prakash Maiya