sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vboot: push clear recovery mode switch until BS_WRITE_TABLES

Browse Source 
Serves two purposes:

(1) On some platforms, FSP initialization may cause a reboot.
Push clearing the recovery mode switch until after FSP code runs,
so that a manual recovery request (three-finger salute) will
function correctly under this condition.

(2) The recovery mode switch value is needed at BS_WRITE_TABLES
for adding an event to elog.  (Previously this was done by
stashing the value in CBMEM_ID_EC_HOSTEVENT.)

BUG=b:124141368, b:35576380
TEST=make clean && make test-abuild
BRANCH=none

Change-Id: I30c02787c620b937e5a50a5ed94ac906e3112dad
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38779
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Joel Kitching
2020-02-08 12:23:23 +08:00
parent e921911f10
commit 81726663bc
8 changed files with 34 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/ec/google/chromeec/ec.c
View File

@@ -81,41 +81,6 @@ static const struct {
},
};
void log_recovery_mode_switch(void)
{
uint64_t *events;
if (cbmem_find(CBMEM_ID_EC_HOSTEVENT))
return;
events = cbmem_add(CBMEM_ID_EC_HOSTEVENT, sizeof(*events));
if (!events)
return;
*events = google_chromeec_get_events_b();
}
static void google_chromeec_elog_add_recovery_event(void *unused)
{
uint64_t *events = cbmem_find(CBMEM_ID_EC_HOSTEVENT);
uint8_t event_byte = EC_HOST_EVENT_KEYBOARD_RECOVERY;
if (!events)
return;
if (!(*events & EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY)))
return;
if (*events &
EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY_HW_REINIT))
event_byte = EC_HOST_EVENT_KEYBOARD_RECOVERY_HW_REINIT;
elog_add_event_byte(ELOG_TYPE_EC_EVENT, event_byte);
}
BOOT_STATE_INIT_ENTRY(BS_WRITE_TABLES, BS_ON_ENTRY,
google_chromeec_elog_add_recovery_event, NULL);
uint8_t google_chromeec_calc_checksum(const uint8_t *data, int size)
{
int csum;

30
src/ec/google/chromeec/switches.c
View File

@@ -14,8 +14,8 @@
*/
#include <bootmode.h>
#include <cbmem.h>
#include <ec/google/chromeec/ec.h>
#include <elog.h>
#if CONFIG(EC_GOOGLE_CHROMEEC_LPC)
int get_lid_switch(void)
@@ -41,29 +41,33 @@ int get_recovery_mode_switch(void)
int get_recovery_mode_retrain_switch(void)
{
uint64_t events;
const uint64_t mask =
EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY_HW_REINIT);
/*
* Check if the EC has posted the keyboard recovery event with memory
* retrain.
*/
events = google_chromeec_get_events_b();
return !!(google_chromeec_get_events_b() &
EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY_HW_REINIT));
}
if (cbmem_possibly_online()) {
const uint64_t *events_save;
static void elog_add_recovery_mode_switch_event(void)
{
uint64_t events = google_chromeec_get_events_b();
uint8_t event_byte = EC_HOST_EVENT_KEYBOARD_RECOVERY;
events_save = cbmem_find(CBMEM_ID_EC_HOSTEVENT);
if (events_save != NULL)
events |= *events_save;
}
if (!(events & EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY)))
return;
return !!(events & mask);
if (events & EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY_HW_REINIT))
event_byte = EC_HOST_EVENT_KEYBOARD_RECOVERY_HW_REINIT;
elog_add_event_byte(ELOG_TYPE_EC_EVENT, event_byte);
}
int clear_recovery_mode_switch(void)
{
/* Log elog event before clearing */
elog_add_recovery_mode_switch_event();
/* Clear all host event bits requesting recovery mode. */
return google_chromeec_clear_events_b(
EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY) |