summaryrefslogtreecommitdiff
path: root/kernel/time
diff options
context:
space:
mode:
authorChunyan Zhang <zhang.lyra@gmail.com>2020-01-10 16:39:02 +0800
committerThomas Gleixner <tglx@linutronix.de>2020-01-15 21:29:45 +0100
commit5167c506d62dd9ffab73eba23c79b0a8845c9fe1 (patch)
tree3677dabbfcfbee8ddc9d3c709c8892c460a1cc45 /kernel/time
parent6b6d188aae79a630957aefd88ff5c42af6553ee3 (diff)
tick/common: Touch watchdog in tick_unfreeze() on all CPUs
Suspend to IDLE invokes tick_unfreeze() on resume. tick_unfreeze() on the first resuming CPU resumes timekeeping, which also has the side effect of resetting the softlockup watchdog on this CPU. But on the secondary CPUs the watchdog is not reset in the resume / unfreeze() path, which can result in false softlockup warnings on those CPUs depending on the time spent in suspend. Prevent this by clearing the softlock watchdog in the unfreeze path also on the secondary resuming CPUs. [ tglx: Massaged changelog ] Signed-off-by: Chunyan Zhang <chunyan.zhang@unisoc.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/20200110083902.27276-1-chunyan.zhang@unisoc.com
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/tick-common.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
index 59225b484e4e..7e5d3524e924 100644
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@ -11,6 +11,7 @@
#include <linux/err.h>
#include <linux/hrtimer.h>
#include <linux/interrupt.h>
+#include <linux/nmi.h>
#include <linux/percpu.h>
#include <linux/profile.h>
#include <linux/sched.h>
@@ -558,6 +559,7 @@ void tick_unfreeze(void)
trace_suspend_resume(TPS("timekeeping_freeze"),
smp_processor_id(), false);
} else {
+ touch_softlockup_watchdog();
tick_resume_local();
}