diff options
| author | Tim Wawrzynczak <twawrzynczak@chromium.org> | 2020-01-16 09:50:53 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-01-16 23:46:40 +0000 |
| commit | 700c0abc2dcbb2ffbb96809e36bd837e33c96974 (patch) | |
| tree | 451500642dff7f3e75157e3f241e379c135ee5d0 | |
| parent | d7a931063328ce9a0ff40961ec65eae119b27cd8 (diff) | |
| download | vboot-700c0abc2dcbb2ffbb96809e36bd837e33c96974.tar.gz | |
Auxfw sync: Remove dependency on EC sync
Auxfw sync used to be guarded by both VB2_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
and VB2_CONTEXT_EC_SYNC_SUPPORTED. Now that the EC and AUXFW sync are
fully decoupled, there are scenarios where it may make sense to do auxfw
sync independent of EC sync, such as early bringup.
BUG=chromium:1041879
BRANCH=none
TEST=make runtests
Change-Id: I07948b0317119231ec0287d663a3d8b92259fd6b
Signed-off-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2004942
Reviewed-by: Julius Werner <jwerner@chromium.org>
| -rw-r--r-- | firmware/2lib/2auxfw_sync.c | 4 | ||||
| -rw-r--r-- | tests/vb2_auxfw_sync_tests.c | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/firmware/2lib/2auxfw_sync.c b/firmware/2lib/2auxfw_sync.c index d44baed4..222b1214 100644 --- a/firmware/2lib/2auxfw_sync.c +++ b/firmware/2lib/2auxfw_sync.c @@ -34,10 +34,6 @@ static int auxfw_sync_allowed(struct vb2_context *ctx) struct vb2_gbb_header *gbb = vb2_get_gbb(ctx); /* Reasons not to do sync at all */ - if (!(ctx->flags & VB2_CONTEXT_EC_SYNC_SUPPORTED)) - return 0; - if (gbb->flags & VB2_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC) - return 0; if (gbb->flags & VB2_GBB_FLAG_DISABLE_AUXFW_SOFTWARE_SYNC) return 0; if (sd->recovery_reason) diff --git a/tests/vb2_auxfw_sync_tests.c b/tests/vb2_auxfw_sync_tests.c index 2ed72dde..48cb206a 100644 --- a/tests/vb2_auxfw_sync_tests.c +++ b/tests/vb2_auxfw_sync_tests.c @@ -115,11 +115,11 @@ static void VbSoftwareSyncTest(void) ResetMocks(); gbb.flags |= VB2_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC; auxfw_mock_severity = VB_AUX_FW_FAST_UPDATE; - test_auxsync(VB2_SUCCESS, 0, + test_auxsync(VBERROR_EC_REBOOT_TO_RO_REQUIRED, 0, "VB2_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC" - " disables auxiliary FW update request"); - TEST_EQ(auxfw_update_req, 0, " aux fw update disabled"); - TEST_EQ(auxfw_protected, 1, " aux fw protected"); + " does not disable auxiliary FW update request"); + TEST_EQ(auxfw_update_req, 1, " aux fw update requested"); + TEST_EQ(auxfw_protected, 0, " aux fw protected"); ResetMocks(); gbb.flags |= VB2_GBB_FLAG_DISABLE_AUXFW_SOFTWARE_SYNC; |