[coreboot-gerrit] Change in coreboot[master]: ec/google/chromeec: Check AP reset cause for watchdog reset

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/49113 )

Change subject: ec/google/chromeec: Check AP reset cause for watchdog reset
......................................................................

ec/google/chromeec: Check AP reset cause for watchdog reset

Different from mt8183, mt8192 doesn't need to trigger EC reboot on HW
initiated watchdog reset. Therefore, ec_reset_flags cannot be used to
determine AP watchdog reset. Instead we check the cause of the last AP
reset.

BUG=b:174443398
TEST=emerge-asurada coreboot
TEST=crash.WatchdogCrash passed on asurada
BRANCH=none

Cq-Depend: chromium:2607150
Change-Id: I761ecdd8811e5612b39e96c73442cc796361d0f0
Signed-off-by: Yu-Ping Wu 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49113
Reviewed-by: Nicolas Boichat 
Reviewed-by: Tim Wawrzynczak 
Tested-by: build bot (Jenkins) 
---
M src/ec/google/chromeec/ec.c
1 file changed, 17 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Nicolas Boichat: Looks good to me, but someone else must approve
  Tim Wawrzynczak: Looks good to me, approved

diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c
index ed7f97d..26c6054 100644
--- a/src/ec/google/chromeec/ec.c
+++ b/src/ec/google/chromeec/ec.c
@@ -993,9 +993,24 @@

bool google_chromeec_get_ap_watchdog_flag(void)
 {
+	int i;
    struct ec_response_uptime_info resp;
-	return (!google_chromeec_get_uptime_info(&resp) &&
-		(resp.ec_reset_flags & EC_RESET_FLAG_AP_WATCHDOG));
+
+	if (google_chromeec_get_uptime_info(&resp))
+		return false;
+
+	if (resp.ec_reset_flags & EC_RESET_FLAG_AP_WATCHDOG)
+		return true;
+
+	/* Find the last valid entry */
+	for (i = ARRAY_SIZE(resp.recent_ap_reset) - 1; i >= 0; i--) {
+		if (resp.recent_ap_reset[i].reset_time_ms == 0)
+			continue;
+		return (resp.recent_ap_reset[i].reset_cause ==
+			CHIPSET_RESET_AP_WATCHDOG);
+	}
+
+	return false;
 }

int google_chromeec_i2c_xfer(uint8_t chip, uint8_t addr, int alen,