Merge android13-gs-pixel-5.10-24Q1 into android13-gs-pixel-5.10android-u-qpr3-beta-1_r0.7android-u-qpr3-beta-1_r0.5android-u-qpr3-beta-1_r0.4android-u-qpr3-beta-1_r0.3android-u-qpr3-beta-1_r0.2android-u-qpr3-beta-1_r0.1android-15-dp-1_r0.7android-15-dp-1_r0.5android-15-dp-1_r0.4android-15-dp-1_r0.3android-15-dp-1_r0.2android-15-dp-1_r0.1

SBMerger: 571992243
Change-Id: Iac42b53b23a42f55678602fad8c999f8761f3e6c
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/aoc_v1.c b/aoc_v1.c
index 1147c43..e67937f 100644
--- a/aoc_v1.c
+++ b/aoc_v1.c
@@ -142,6 +142,7 @@ int aoc_watchdog_restart(struct aoc_prvdata *prvdata,
 		aoc_req_rc = wait_for_aoc_status(prvdata, true);
 		if (aoc_req_rc) {
 			dev_err(prvdata->dev, "timed out waiting for aoc_ack\n");
+			notify_timeout_aoc_status();
 			continue;
 		}
 		dev_info(prvdata->dev, "resetting aoc\n");
@@ -174,6 +175,8 @@ int aoc_watchdog_restart(struct aoc_prvdata *prvdata,
 
 	if (aoc_req_rc && *(aoc_module_params->aoc_panic_on_req_timeout)) {
 		dev_err(prvdata->dev, "timed out too many times waiting for aoc_ack, triggering kernel panic\n");
+		/* Sleep to ensure aocd can process notification of timeout before panic */
+		msleep(1000);
 		panic("AoC kernel panic: timed out waiting for aoc_ack");
 	}