summaryrefslogtreecommitdiff
path: root/chip/ish/aontaskfw/ish_aontask.c
diff options
context:
space:
mode:
authorHu, Hebo <hebo.hu@intel.com>2019-05-07 16:42:03 +0800
committerchrome-bot <chrome-bot@chromium.org>2019-05-09 16:05:40 -0700
commit6513dabd100d20a0c15ab65c126d865159672568 (patch)
treec5f30e39530a9b61d90f2a2d9d2a1cf84b9bdb49 /chip/ish/aontaskfw/ish_aontask.c
parent962662c31592cec308264dcaa4c88288e72a9fdc (diff)
downloadchrome-ec-6513dabd100d20a0c15ab65c126d865159672568.tar.gz
ish/ish5: remove watchdog disable during D0ix
ECOS will reload watchdog in hook task for every HOOK_TICK_INTERVAL time, and this will make HPET timer 1 wakeup ish. Therefore, we do not need to disable watchdog during D0ix. D3 and reset prep flow still need disable watchdog. BUG=b:132112137 BRANCH=none TEST='waitms 10500' console command can trigger watchdog timeout and ish reboot Change-Id: I11aad5ece0ce96bc53738512290c1e42bf175479 Signed-off-by: Hu, Hebo <hebo.hu@intel.com> Reviewed-on: https://chromium-review.googlesource.com/1598713 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Tested-by: Jack Rosenthal <jrosenth@chromium.org> Reviewed-by: Jett Rink <jettrink@chromium.org> Reviewed-by: Hebo Hu <hebo.hu@intel.corp-partner.google.com> Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'chip/ish/aontaskfw/ish_aontask.c')
-rw-r--r--chip/ish/aontaskfw/ish_aontask.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/chip/ish/aontaskfw/ish_aontask.c b/chip/ish/aontaskfw/ish_aontask.c
index 187d073671..95b6d9ce5d 100644
--- a/chip/ish/aontaskfw/ish_aontask.c
+++ b/chip/ish/aontaskfw/ish_aontask.c
@@ -543,6 +543,9 @@ static void handle_d3(void)
static void handle_reset(int pm_state)
{
+ /* disable watch dog */
+ WDT_CONTROL &= ~WDT_CONTROL_ENABLE_BIT;
+
/* disable CSME CSR irq */
IPC_PIMR &= ~IPC_PIMR_CSME_CSR_BIT;