diff options
| author | Richard Cochran <rcochran@linutronix.de> | 2016-03-18 22:26:08 +0100 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2016-05-14 09:22:21 +0200 |
| commit | ebbf677a3fb54fda56c58fc985c4617c215da6a0 (patch) | |
| tree | 4f02076f8c61d9a99808fcbb53d672e240f7970c /drivers/watchdog | |
| parent | b6ef36d2c1e391adc1fe1b2dd2a0f887a9f3052b (diff) | |
| download | op-kernel-dev-ebbf677a3fb54fda56c58fc985c4617c215da6a0.zip op-kernel-dev-ebbf677a3fb54fda56c58fc985c4617c215da6a0.tar.gz | |
watchdog: octeon: Handle the FROZEN hot plug notifier actions.
When performing a suspend operation, the kernel brings all of the
non-boot CPUs offline, calling the hot plug notifiers with the flag,
CPU_TASKS_FROZEN, set in the action code. Similarly, during resume,
the CPUs are brought back online, but again the notifiers have the
FROZEN flag set.
While some very few drivers really need to treat suspend/resume
specially, this driver unintentionally ignores the notifications.
This patch changes the driver to disable the watchdog interrupt
whenever the CPU goes offline, and to enable it whenever the CPU goes
back online. As a result, the suspended state is no longer a special
case that leaves the watchdog active.
Signed-off-by: Richard Cochran <rcochran@linutronix.de>
Cc: linux-watchdog@vger.kernel.org
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/octeon-wdt-main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/octeon-wdt-main.c b/drivers/watchdog/octeon-wdt-main.c index 14521c8..b55981f 100644 --- a/drivers/watchdog/octeon-wdt-main.c +++ b/drivers/watchdog/octeon-wdt-main.c @@ -431,7 +431,7 @@ static int octeon_wdt_cpu_callback(struct notifier_block *nfb, { unsigned int cpu = (unsigned long)hcpu; - switch (action) { + switch (action & ~CPU_TASKS_FROZEN) { case CPU_DOWN_PREPARE: octeon_wdt_disable_interrupt(cpu); break; |
