diff options
| author | Yu-Ping Wu <yupingso@chromium.org> | 2020-04-10 08:54:05 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-04-28 08:11:14 +0000 |
| commit | 3aab301473ec0b95f109a245efeadc20c3b7d57d (patch) | |
| tree | 326de14736d5f65a5eda2c6bc71771ced121e272 /tests/vb2_auxfw_sync_tests.c | |
| parent | b2dca286baa74b71da70fb59e8a3f94df57269fe (diff) | |
| download | vboot-3aab301473ec0b95f109a245efeadc20c3b7d57d.tar.gz | |
vboot: Convert reboot-related errors to vboot2-style
Error codes are renamed as follows:
VBERROR_SHUTDOWN_REQUESTED
--> VB2_REQUEST_SHUTDOWN
VBERROR_REBOOT_REQUIRED
--> VB2_REQUEST_REBOOT
VBERROR_EC_REBOOT_TO_SWITCH_RW
--> VB2_REQUEST_REBOOT_EC_SWITCH_RW
VBERROR_EC_REBOOT_TO_RO_REQUIRED
--> VB2_REQUEST_REBOOT_EC_TO_RO
VBERROR_KEEP_LOOPING
--> VB2_REQUEST_UI_CONTINUE
Since these are not really "errors", they're renamed to VB2_REQUEST_*
instead, with larger values to separate from real errors.
The old vboot1-style errors will be removed once the errors are renamed
in coreboot and depthcharge.
BRANCH=none
BUG=b:124141368, chromium:988410
TEST=make runtests
Change-Id: Ide1328f9c0f2803534fb3f1f1ecd16ad8ea36a4e
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2143030
Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-by: Joel Kitching <kitching@chromium.org>
Diffstat (limited to 'tests/vb2_auxfw_sync_tests.c')
| -rw-r--r-- | tests/vb2_auxfw_sync_tests.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/vb2_auxfw_sync_tests.c b/tests/vb2_auxfw_sync_tests.c index 823dec0b..104455f9 100644 --- a/tests/vb2_auxfw_sync_tests.c +++ b/tests/vb2_auxfw_sync_tests.c @@ -70,7 +70,7 @@ vb2_error_t vb2ex_auxfw_check(enum vb2_auxfw_update_severity *severity) auxfw_update_severity = auxfw_mock_severity; if (*severity == VB_AUX_FW_SLOW_UPDATE) if (!auxfw_mock_display_available) - return VBERROR_REBOOT_REQUIRED; + return VB2_REQUEST_REBOOT; return VB2_SUCCESS; } @@ -103,7 +103,7 @@ static void VbSoftwareSyncTest(void) ResetMocks(); gbb.flags |= VB2_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC; auxfw_mock_severity = VB_AUX_FW_FAST_UPDATE; - test_auxsync(VBERROR_EC_REBOOT_TO_RO_REQUIRED, 0, + test_auxsync(VB2_REQUEST_REBOOT_EC_TO_RO, 0, "VB2_GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC" " does not disable auxiliary FW update request"); TEST_EQ(auxfw_update_req, 1, " aux fw update requested"); @@ -134,7 +134,7 @@ static void VbSoftwareSyncTest(void) ResetMocks(); auxfw_mock_severity = VB_AUX_FW_FAST_UPDATE; - test_auxsync(VBERROR_EC_REBOOT_TO_RO_REQUIRED, 0, + test_auxsync(VB2_REQUEST_REBOOT_EC_TO_RO, 0, "Fast auxiliary FW update needed"); TEST_EQ(auxfw_update_req, 1, " aux fw update requested"); TEST_EQ(auxfw_protected, 0, " aux fw protected"); @@ -142,12 +142,12 @@ static void VbSoftwareSyncTest(void) ResetMocks(); auxfw_mock_severity = VB_AUX_FW_SLOW_UPDATE; auxfw_mock_display_available = 0; - test_auxsync(VBERROR_REBOOT_REQUIRED, 0, + test_auxsync(VB2_REQUEST_REBOOT, 0, "Slow auxiliary FW update needed - reboot for display"); ResetMocks(); auxfw_mock_severity = VB_AUX_FW_SLOW_UPDATE; - test_auxsync(VBERROR_EC_REBOOT_TO_RO_REQUIRED, 0, + test_auxsync(VB2_REQUEST_REBOOT_EC_TO_RO, 0, "Slow auxiliary FW update needed"); TEST_EQ(auxfw_update_req, 1, " aux fw update requested"); TEST_EQ(auxfw_protected, 0, " aux fw protected"); |