diff options
| author | Yu-Ping Wu <yupingso@chromium.org> | 2023-01-31 03:55:23 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-01-31 04:58:22 +0000 |
| commit | 25797a2876988a7488578015a995f612b2a9cbde (patch) | |
| tree | 39b03f483d84e8f0eae6b9562b3618be7cf12a4d | |
| parent | 808624897ffcffd80136f1a72f0f7fb12211c18b (diff) | |
| download | vboot-firmware-asurada-13885.B.tar.gz | |
Revert "firmware: kernel_phase1: Commit disable_dev_request if forbidden by FWMP"firmware-asurada-13885.B
This reverts commit 808624897ffcffd80136f1a72f0f7fb12211c18b.
Reason for revert: Breaking RMA Server Unlock (b/266013201#comment8).
Original change's description:
> firmware: kernel_phase1: Commit disable_dev_request if forbidden by FWMP
>
> This patch makes kernel_phase1() check if developer mode is disabled by
> FWMP and set the disable_dev_request nvdata flag right away in that
> case.
>
> This is a backport of CL:4178837 to the point before CL:3053541 and
> CL:3041498 landed.
>
> BRANCH=all
> BUG=b:266013201
> TEST=none
>
> Signed-off-by: Julius Werner <jwerner@chromium.org>
> Change-Id: I950b0dfe2fd5ce5c1fa8eb2efb128fa5d709343a
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/4178839
> Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
> Commit-Queue: Yu-Ping Wu <yupingso@chromium.org>
> Tested-by: Yu-Ping Wu <yupingso@chromium.org>
Bug: b:266013201
Change-Id: I9f6774fcb490479f216ded25883b8c613436c334
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/4206628
Auto-Submit: Yu-Ping Wu <yupingso@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Tested-by: Yu-Ping Wu <yupingso@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
| -rw-r--r-- | firmware/2lib/2kernel.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/firmware/2lib/2kernel.c b/firmware/2lib/2kernel.c index 43ea085a..763214dd 100644 --- a/firmware/2lib/2kernel.c +++ b/firmware/2lib/2kernel.c @@ -157,15 +157,6 @@ vb2_error_t vb2api_kernel_phase1(struct vb2_context *ctx) vb2_secdata_kernel_get(ctx, VB2_SECDATA_KERNEL_VERSIONS); sd->kernel_version = sd->kernel_version_secdata; - /* If we're in developer mode when we shouldn't be, disable as soon as - possible and commit that decision right away (b/266013201). */ - if (vb2_secdata_fwmp_get_flag(ctx, VB2_SECDATA_FWMP_DEV_DISABLE_BOOT) && - !(vb2_get_gbb(ctx)->flags & VB2_GBB_FLAG_FORCE_DEV_SWITCH_ON) && - (ctx->flags & VB2_CONTEXT_DEVELOPER_MODE)) { - vb2_nv_set(ctx, VB2_NV_DISABLE_DEV_REQUEST, 1); - vb2ex_commit_data(ctx); - } - /* Find the key to use to verify the kernel keyblock */ if ((ctx->flags & VB2_CONTEXT_RECOVERY_MODE)) { /* Load recovery key from GBB. */ |