vboot: fix legacy_clamshell_tests when PHYSICAL_PRESENCE_KEYBOARD=1
Physical presence checks in VbUserConfirms are only invoked
when PHYSICAL_PRESENCE_KEYBOARD=0. Disable these tests when
PHYSICAL_PRESENCE_KEYBOARD=1.
BUG=chromium:943150
TEST=PHYSICAL_PRESENCE_KEYBOARD=0 make runtests
TEST=PHYSICAL_PRESENCE_KEYBOARD=1 make runtests
BRANCH=none
Signed-off-by: Joel Kitching <kitching@google.com>
Change-Id: I0c32913549a856855918c54378e5d265851abe37
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2237086
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
diff --git a/tests/vboot_ui_legacy_clamshell_tests.c b/tests/vboot_ui_legacy_clamshell_tests.c
index 84f7ea7..b7bc6d5 100644
--- a/tests/vboot_ui_legacy_clamshell_tests.c
+++ b/tests/vboot_ui_legacy_clamshell_tests.c
@@ -336,7 +336,7 @@
}
}
-static void VbUserConfirmsTest(void)
+static void VbUserConfirmsKeyboardTest(void)
{
VB2_DEBUG("Testing VbUserConfirms()...\n");
@@ -382,6 +382,23 @@
0, "Untrusted keyboard");
ResetMocks();
+ mock_keypress[0] = VB_KEY_ENTER;
+ mock_keypress[1] = 'y';
+ mock_keypress[2] = 'z';
+ mock_keypress[3] = ' ';
+ mock_gpio[0].gpio_flags = GPIO_PRESENCE;
+ mock_gpio[0].count = ~0;
+ TEST_EQ(VbUserConfirms(ctx,
+ VB_CONFIRM_SPACE_MEANS_NO |
+ VB_CONFIRM_MUST_TRUST_KEYBOARD),
+ 0, "Recovery button stuck");
+
+ VB2_DEBUG("...done.\n");
+}
+
+static void VbUserConfirmsPhysicalPresenceTest(void)
+{
+ ResetMocks();
MockGpioAfter(0, GPIO_PRESENCE);
TEST_EQ(VbUserConfirms(ctx,
VB_CONFIRM_SPACE_MEANS_NO |
@@ -464,18 +481,6 @@
VbUserConfirmsTestGpio(GPIO_PRESENCE | GPIO_SHUTDOWN,
GPIO_PRESENCE, 0, 0, "both, presence");
- ResetMocks();
- mock_keypress[0] = VB_KEY_ENTER;
- mock_keypress[1] = 'y';
- mock_keypress[2] = 'z';
- mock_keypress[3] = ' ';
- mock_gpio[0].gpio_flags = GPIO_PRESENCE;
- mock_gpio[0].count = ~0;
- TEST_EQ(VbUserConfirms(ctx,
- VB_CONFIRM_SPACE_MEANS_NO |
- VB_CONFIRM_MUST_TRUST_KEYBOARD),
- 0, "Recovery button stuck");
- VB2_DEBUG("...done.\n");
}
static void VbBootDevTest(void)
@@ -1303,23 +1308,6 @@
TEST_NEQ(screens_displayed[1], VB_SCREEN_RECOVERY_TO_DEV,
" todev screen");
- /* Ctrl+D ignored because the physical presence switch is still pressed
- and we don't like that. */
- ResetMocks();
- sd->flags = VB2_SD_FLAG_MANUAL_RECOVERY;
- trust_ec = 1;
- mock_keypress[0] = VB_KEY_CTRL('D');
- mock_gpio[0].gpio_flags = GPIO_PRESENCE;
- mock_gpio[0].count = 100;
- mock_gpio[1].gpio_flags = GPIO_PRESENCE | GPIO_SHUTDOWN;
- mock_gpio[1].count = 100;
- vbtlk_expect_removable = 1;
- TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
- VB2_REQUEST_SHUTDOWN,
- "Ctrl+D ignored if phys pres button is still pressed");
- TEST_NEQ(screens_displayed[1], VB_SCREEN_RECOVERY_TO_DEV,
- " todev screen");
-
/* Ctrl+D then space means don't enable */
ResetMocks();
sd->flags = VB2_SD_FLAG_MANUAL_RECOVERY;
@@ -1355,88 +1343,6 @@
"Ctrl+D todev confirm via enter");
TEST_EQ(virtdev_set, 1, " virtual dev mode on");
- /*
- * List of possiblities for shutdown and physical presence events that
- * occur over time. Time advanced from left to right (where each
- * represents the gpio[s] that are seen during a given iteration of
- * the loop). The meaning of the characters:
- *
- * _ means no gpio
- * s means shutdown gpio
- * p means presence gpio
- * B means both shutdown and presence gpio
- *
- * 1: ______ppp______ -> confirm
- * 2: ______sss______ -> shutdown
- * 3: ___pppsss______ -> confirm
- * 4: ___sssppp______ -> shutdown
- * 5: ___pppBBB______ -> confirm
- * 6: ___pppBBBppp___ -> shutdown
- * 7: ___pppBBBsss___ -> confirm
- * 8: ___sssBBB______ -> confirm
- * 9: ___sssBBBppp___ -> shutdown
- * 10: ___sssBBBsss___ -> confirm
- * 11: ______BBB______ -> confirm
- * 12: ______BBBsss___ -> confirm
- * 13: ______BBBppp___ -> shutdown
- */
-
- /* 1: Ctrl+D then presence means enable */
- VbBootRecTestGpio(GPIO_PRESENCE, 0, 0, 1,
- "Ctrl+D todev confirm via presence");
-
- /* 2: Ctrl+D then shutdown means shutdown */
- VbBootRecTestGpio(GPIO_SHUTDOWN, 0, 0, 0,
- "Ctrl+D todev then shutdown");
-
- /* 3: Ctrl+D then presence then shutdown means confirm */
- VbBootRecTestGpio(GPIO_PRESENCE, GPIO_SHUTDOWN, 0, 1,
- "Ctrl+D todev confirm via presence then shutdown");
-
- /* 4: Ctrl+D then 2+ instance shutdown then presence means shutdown */
- VbBootRecTestGpio(GPIO_SHUTDOWN, GPIO_PRESENCE, 0, 0,
- "Ctrl+D todev then 2+ shutdown then presence");
-
- /* 5: Ctrl+D then presence then shutdown+presence then none */
- VbBootRecTestGpio(GPIO_PRESENCE, GPIO_PRESENCE | GPIO_SHUTDOWN, 0, 1,
- "Ctrl+D todev confirm via presence, both, none");
-
- /* 6: Ctrl+D then presence then shutdown+presence then presence */
- VbBootRecTestGpio(GPIO_PRESENCE, GPIO_PRESENCE | GPIO_SHUTDOWN,
- GPIO_PRESENCE, 0,
- "Ctrl+D todev confirm via presence, both, presence");
-
- /* 7: Ctrl+D then presence then shutdown+presence then shutdown */
- VbBootRecTestGpio(GPIO_PRESENCE, GPIO_PRESENCE | GPIO_SHUTDOWN,
- GPIO_SHUTDOWN, 1,
- "Ctrl+D todev confirm via presence, both, shutdown");
-
- /* 8: Ctrl+D then shutdown then shutdown+presence then none */
- VbBootRecTestGpio(GPIO_SHUTDOWN, GPIO_PRESENCE | GPIO_SHUTDOWN, 0, 1,
- "Ctrl+D todev then 2+ shutdown, both, none");
-
- /* 9: Ctrl+D then shutdown then shutdown+presence then presence */
- VbBootRecTestGpio(GPIO_SHUTDOWN, GPIO_PRESENCE | GPIO_SHUTDOWN,
- GPIO_PRESENCE, 0,
- "Ctrl+D todev then 2+ shutdown, both, presence");
-
- /* 10: Ctrl+D then shutdown then shutdown+presence then shutdown */
- VbBootRecTestGpio(GPIO_SHUTDOWN, GPIO_PRESENCE | GPIO_SHUTDOWN,
- GPIO_SHUTDOWN, 1,
- "Ctrl+D todev then 2+ shutdown, both, shutdown");
-
- /* 11: Ctrl+D then shutdown+presence then none */
- VbBootRecTestGpio(GPIO_PRESENCE | GPIO_SHUTDOWN, 0, 0, 1,
- "Ctrl+D todev confirm via both then none");
-
- /* 12: Ctrl+D then shutdown+presence then shutdown */
- VbBootRecTestGpio(GPIO_PRESENCE | GPIO_SHUTDOWN, GPIO_SHUTDOWN, 0, 1,
- "Ctrl+D todev confirm via both then shutdown");
-
- /* 13: Ctrl+D then shutdown+presence then presence */
- VbBootRecTestGpio(GPIO_PRESENCE | GPIO_SHUTDOWN, GPIO_PRESENCE, 0, 0,
- "Ctrl+D todev confirm via both then presence");
-
/* Don't handle TPM error in enabling dev mode */
ResetMocks();
sd->flags = VB2_SD_FLAG_MANUAL_RECOVERY;
@@ -1527,6 +1433,109 @@
VB2_DEBUG("...done.\n");
}
+static void VbBootRecPhysicalPresenceTest(void)
+{
+
+ /* Ctrl+D ignored because the physical presence switch is still pressed
+ and we don't like that. */
+ ResetMocks();
+ sd->flags = VB2_SD_FLAG_MANUAL_RECOVERY;
+ trust_ec = 1;
+ mock_keypress[0] = VB_KEY_CTRL('D');
+ mock_gpio[0].gpio_flags = GPIO_PRESENCE;
+ mock_gpio[0].count = 100;
+ mock_gpio[1].gpio_flags = GPIO_PRESENCE | GPIO_SHUTDOWN;
+ mock_gpio[1].count = 100;
+ vbtlk_expect_removable = 1;
+ TEST_EQ(VbBootRecoveryLegacyClamshell(ctx),
+ VB2_REQUEST_SHUTDOWN,
+ "Ctrl+D ignored if phys pres button is still pressed");
+ TEST_NEQ(screens_displayed[1], VB_SCREEN_RECOVERY_TO_DEV,
+ " todev screen");
+
+ /*
+ * List of possiblities for shutdown and physical presence events that
+ * occur over time. Time advanced from left to right (where each
+ * represents the gpio[s] that are seen during a given iteration of
+ * the loop). The meaning of the characters:
+ *
+ * _ means no gpio
+ * s means shutdown gpio
+ * p means presence gpio
+ * B means both shutdown and presence gpio
+ *
+ * 1: ______ppp______ -> confirm
+ * 2: ______sss______ -> shutdown
+ * 3: ___pppsss______ -> confirm
+ * 4: ___sssppp______ -> shutdown
+ * 5: ___pppBBB______ -> confirm
+ * 6: ___pppBBBppp___ -> shutdown
+ * 7: ___pppBBBsss___ -> confirm
+ * 8: ___sssBBB______ -> confirm
+ * 9: ___sssBBBppp___ -> shutdown
+ * 10: ___sssBBBsss___ -> confirm
+ * 11: ______BBB______ -> confirm
+ * 12: ______BBBsss___ -> confirm
+ * 13: ______BBBppp___ -> shutdown
+ */
+
+ /* 1: Ctrl+D then presence means enable */
+ VbBootRecTestGpio(GPIO_PRESENCE, 0, 0, 1,
+ "Ctrl+D todev confirm via presence");
+
+ /* 2: Ctrl+D then shutdown means shutdown */
+ VbBootRecTestGpio(GPIO_SHUTDOWN, 0, 0, 0,
+ "Ctrl+D todev then shutdown");
+
+ /* 3: Ctrl+D then presence then shutdown means confirm */
+ VbBootRecTestGpio(GPIO_PRESENCE, GPIO_SHUTDOWN, 0, 1,
+ "Ctrl+D todev confirm via presence then shutdown");
+
+ /* 4: Ctrl+D then 2+ instance shutdown then presence means shutdown */
+ VbBootRecTestGpio(GPIO_SHUTDOWN, GPIO_PRESENCE, 0, 0,
+ "Ctrl+D todev then 2+ shutdown then presence");
+
+ /* 5: Ctrl+D then presence then shutdown+presence then none */
+ VbBootRecTestGpio(GPIO_PRESENCE, GPIO_PRESENCE | GPIO_SHUTDOWN, 0, 1,
+ "Ctrl+D todev confirm via presence, both, none");
+
+ /* 6: Ctrl+D then presence then shutdown+presence then presence */
+ VbBootRecTestGpio(GPIO_PRESENCE, GPIO_PRESENCE | GPIO_SHUTDOWN,
+ GPIO_PRESENCE, 0,
+ "Ctrl+D todev confirm via presence, both, presence");
+
+ /* 7: Ctrl+D then presence then shutdown+presence then shutdown */
+ VbBootRecTestGpio(GPIO_PRESENCE, GPIO_PRESENCE | GPIO_SHUTDOWN,
+ GPIO_SHUTDOWN, 1,
+ "Ctrl+D todev confirm via presence, both, shutdown");
+
+ /* 8: Ctrl+D then shutdown then shutdown+presence then none */
+ VbBootRecTestGpio(GPIO_SHUTDOWN, GPIO_PRESENCE | GPIO_SHUTDOWN, 0, 1,
+ "Ctrl+D todev then 2+ shutdown, both, none");
+
+ /* 9: Ctrl+D then shutdown then shutdown+presence then presence */
+ VbBootRecTestGpio(GPIO_SHUTDOWN, GPIO_PRESENCE | GPIO_SHUTDOWN,
+ GPIO_PRESENCE, 0,
+ "Ctrl+D todev then 2+ shutdown, both, presence");
+
+ /* 10: Ctrl+D then shutdown then shutdown+presence then shutdown */
+ VbBootRecTestGpio(GPIO_SHUTDOWN, GPIO_PRESENCE | GPIO_SHUTDOWN,
+ GPIO_SHUTDOWN, 1,
+ "Ctrl+D todev then 2+ shutdown, both, shutdown");
+
+ /* 11: Ctrl+D then shutdown+presence then none */
+ VbBootRecTestGpio(GPIO_PRESENCE | GPIO_SHUTDOWN, 0, 0, 1,
+ "Ctrl+D todev confirm via both then none");
+
+ /* 12: Ctrl+D then shutdown+presence then shutdown */
+ VbBootRecTestGpio(GPIO_PRESENCE | GPIO_SHUTDOWN, GPIO_SHUTDOWN, 0, 1,
+ "Ctrl+D todev confirm via both then shutdown");
+
+ /* 13: Ctrl+D then shutdown+presence then presence */
+ VbBootRecTestGpio(GPIO_PRESENCE | GPIO_SHUTDOWN, GPIO_PRESENCE, 0, 0,
+ "Ctrl+D todev confirm via both then presence");
+}
+
static void VbBootDiagTest(void)
{
VB2_DEBUG("Testing VbBootDiagnosticLegacyClamshell()...\n");
@@ -1630,10 +1639,14 @@
int main(void)
{
- VbUserConfirmsTest();
+ VbUserConfirmsKeyboardTest();
+ if (!PHYSICAL_PRESENCE_KEYBOARD)
+ VbUserConfirmsPhysicalPresenceTest();
VbBootDevTest();
VbBootDevVendorDataTest();
VbBootRecTest();
+ if (!PHYSICAL_PRESENCE_KEYBOARD)
+ VbBootRecPhysicalPresenceTest();
if (DIAGNOSTIC_UI)
VbBootDiagTest();
