diff options
| author | Yu-Ping Wu <yupingso@chromium.org> | 2022-05-18 13:55:37 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-05-21 14:19:07 +0000 |
| commit | 03007d79ec87f55bc0b38279c8abf3fc955c1780 (patch) | |
| tree | fe4bd9064e40044c6d87e6d81b8797a7f1d2226c /tests/vboot_api_kernel_tests.c | |
| parent | 2407b678bd2e41422aef6bb79246dbeaf6dfed7f (diff) | |
| download | vboot-firmware-cherry-14454.B.tar.gz | |
vboot: Move TPM disabling call to depthchargefirmware-cherry-14454.B
Introduce a new vboot context flag VB2_CONTEXT_DISABLE_TPM to indicate
whether TPM should be disabled before jumping to kernel. This allows us
to move the vb2ex_tpm_set_mode(VB2_TPM_MODE_DISABLED) call from vboot to
depthcharge. See CL:3653659 for details.
BUG=b:223662000, b:232743820
TEST=make runtests
TEST=emerge-cherry depthcharge
BRANCH=cherry
Cq-Depend: chromium:3653659
Change-Id: Ie7bcc3c7bf01346a3bc1f9e14b30017a4c3148ac
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3653207
Reviewed-by: Julius Werner <jwerner@chromium.org>
(cherry picked from commit d14e1c4b4ec45c8d23adf88aaff460d758275d66)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3655399
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Commit-Queue: Hung-Te Lin <hungte@chromium.org>
Diffstat (limited to 'tests/vboot_api_kernel_tests.c')
| -rw-r--r-- | tests/vboot_api_kernel_tests.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/vboot_api_kernel_tests.c b/tests/vboot_api_kernel_tests.c index b66c4320..b2d4236e 100644 --- a/tests/vboot_api_kernel_tests.c +++ b/tests/vboot_api_kernel_tests.c @@ -602,6 +602,8 @@ static void VbTryLoadKernelTest(void) " load disk"); } TEST_EQ(got_external_mismatch, 0, " external GPT errors"); + TEST_EQ(!!(ctx->flags & VB2_CONTEXT_DISABLE_TPM), 0, + " ctx flag disable_tpm"); } TEST_EQ(lk_normal_calls, load_kernel_calls, " LoadKernel called"); TEST_EQ(lk_minios_calls, 0, " LoadMiniOsKernel not called"); @@ -627,6 +629,8 @@ static void VbTryLoadMiniOsKernelTest(void) " load disk"); } TEST_EQ(got_external_mismatch, 0, " external GPT errors"); + TEST_EQ(!!(ctx->flags & VB2_CONTEXT_DISABLE_TPM), 1, + " ctx flag disable_tpm"); } TEST_EQ(lk_normal_calls, 0, " LoadKernel not called"); TEST_EQ(lk_minios_calls, load_kernel_calls, |