From d1215269a7bc9b3df82548a7ebdb0e468b18e1df Mon Sep 17 00:00:00 2001 From: Keith Short Date: Tue, 15 Jan 2019 10:32:22 -0700 Subject: [PATCH] src/mainboard/google/sarien: query recovery mode from Cr50 On the Sarien/Arcada platforms, the EC is not trusted to provide the state of the ESC+REFRESH+PWR recovery combination. On these platforms the Cr50 latches the state of REFRESH+PWR for use as the recovery mode key combination. BUG=b:122715254 BRANCH=none TEST=Verify recovery mode screen shown after pressing REFRESH+PWR Change-Id: If336e9d7016987be151ab30d5c037ead3a998fe0 Signed-off-by: Keith Short Reviewed-on: https://review.coreboot.org/c/30937 Tested-by: build bot (Jenkins) Reviewed-by: Duncan Laurie --- src/mainboard/google/sarien/chromeos.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/mainboard/google/sarien/chromeos.c b/src/mainboard/google/sarien/chromeos.c index 1e77cd9ff8..8b2090e5b0 100644 --- a/src/mainboard/google/sarien/chromeos.c +++ b/src/mainboard/google/sarien/chromeos.c @@ -19,6 +19,8 @@ #include #include #include +#include + void fill_lb_gpios(struct lb_gpios *gpios) { @@ -70,7 +72,16 @@ int get_write_protect_state(void) int get_recovery_mode_switch(void) { - return cros_get_gpio_value(CROS_GPIO_REC); + uint8_t recovery_button_state; + int recovery_mode_switch = 0; + + if (cros_get_gpio_value(CROS_GPIO_REC)) + recovery_mode_switch = 1; + else if (tlcl_cr50_get_recovery_button(&recovery_button_state) + == TPM_SUCCESS) + recovery_mode_switch = recovery_button_state; + + return recovery_mode_switch; } int get_lid_switch(void)