From 85bb874c9c4cd48b9aad050a4232f5e8d6a7bbad Mon Sep 17 00:00:00 2001 From: You-Cheng Syu Date: Tue, 12 Mar 2019 13:02:18 +0800 Subject: google/chromeos: Support AP watchdog flag from Chrome EC After ChromiumOS CL:1293132 and CL:1295890, Chrome EC can store the flag telling if the last reboot was triggered by AP watchdog for some boards (e.g., Kukui). This CL adds a new function google_chromeec_get_ap_watchdog_flag(), which reads the AP watchdog flag from Chrome EC, and updates the tables of reset causes and reset flags. A new Kconfig option CHROMEOS_USE_EC_WATCHDOG_FLAG is added for elog_handle_watchdog_tombstone() to determine if watchdog reset was triggered by the AP watchdog flag from EC instead of the tombstone in AP. BUG=b:109900671,b:118654976 BRANCH=none TEST=test with https://review.coreboot.org/c/coreboot/+/31843 Change-Id: I7a970666a8c6da32ac1c6af8280e808fe7fc106d Signed-off-by: You-Cheng Syu Reviewed-on: https://review.coreboot.org/c/coreboot/+/31834 Tested-by: build bot (Jenkins) Reviewed-by: Hung-Te Lin --- src/vendorcode/google/chromeos/Kconfig | 6 ++++++ src/vendorcode/google/chromeos/watchdog.c | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) (limited to 'src/vendorcode/google') diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig index 26ee31edc7..2ff7ec70b8 100644 --- a/src/vendorcode/google/chromeos/Kconfig +++ b/src/vendorcode/google/chromeos/Kconfig @@ -89,5 +89,11 @@ config CHROMEOS_DISABLE_PLATFORM_HIERARCHY_ON_RESUME on normal boot as well as resume and coreboot is only involved in the resume piece w.r.t. the platform hierarchy. +config CHROMEOS_USE_EC_WATCHDOG_FLAG + bool + default n + help + Use the AP watchdog flag stored in EC. + endif # CHROMEOS endmenu diff --git a/src/vendorcode/google/chromeos/watchdog.c b/src/vendorcode/google/chromeos/watchdog.c index 4557251ef6..2b2959f016 100644 --- a/src/vendorcode/google/chromeos/watchdog.c +++ b/src/vendorcode/google/chromeos/watchdog.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -30,13 +31,19 @@ DECLARE_OPTIONAL_REGION(watchdog_tombstone); static void elog_handle_watchdog_tombstone(void *unused) { - if (!REGION_SIZE(watchdog_tombstone)) - return; + bool flag = false; - if (read32(_watchdog_tombstone) == WATCHDOG_TOMBSTONE_MAGIC) - elog_add_event(ELOG_TYPE_ASYNC_HW_TIMER_EXPIRED); + if (CONFIG(CHROMEOS_USE_EC_WATCHDOG_FLAG)) + flag |= google_chromeec_get_ap_watchdog_flag(); + + if (REGION_SIZE(watchdog_tombstone)) { + flag |= (read32(_watchdog_tombstone) == + WATCHDOG_TOMBSTONE_MAGIC); + write32(_watchdog_tombstone, 0); + } - write32(_watchdog_tombstone, 0); + if (flag) + elog_add_event(ELOG_TYPE_ASYNC_HW_TIMER_EXPIRED); } BOOT_STATE_INIT_ENTRY(BS_POST_DEVICE, BS_ON_ENTRY, -- cgit v1.2.3