summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorRenn Wu <rewu@nvidia.com>2015-02-03 10:27:18 +0800
committerMatthew Pedro <mapedro@nvidia.com>2015-06-08 12:01:04 -0700
commitb1de4caf2f12e1bc9c3a4e08dd60b5de53b7520a (patch)
tree727935d014482a714ef9808ce4245ca4a6b19efc /kernel
parentd89af238e13dbd1f2a01cb5392902313ad367ef2 (diff)
watchdog: use FIQ WDT for soft lockup stack dump
Using Tegra WDT to trigger FIQ when system is in soft lockup. Bug 1581432 Change-Id: I853a88a3f6e9402c978db18c5a63e903c582040a Signed-off-by: Renn Wu <rewu@nvidia.com> Reviewed-on: http://git-master/r/265871 (cherry picked from commit f115f435d471af22ddec5e9d969662f79193f846) Reviewed-on: http://git-master/r/680353 GVS: Gerrit_Virtual_Submit Reviewed-by: Bibek Basu <bbasu@nvidia.com> Reviewed-by: Winnie Hsu <whsu@nvidia.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/watchdog.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 274e737a92e6..38d0aab8a89b 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -2,6 +2,7 @@
* Detect hard and soft lockups on a system
*
* started by Don Zickus, Copyright (C) 2010 Red Hat, Inc.
+ * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved.
*
* Note: Most of this code is borrowed heavily from the original softlockup
* detector, so thanks to Ingo for the initial implementation.
@@ -415,6 +416,8 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer)
else
dump_stack();
+ set_wdt_nmi_ack_off();
+
if (softlockup_panic)
panic("softlockup: hung tasks");
__this_cpu_write(soft_watchdog_warn, true);