aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Usyskin <alexander.usyskin@intel.com>2016-11-08 10:55:52 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-06 04:40:16 -0500
commit2eccf0e0bcb1b164b93d83b4578a1f39ace3fff6 (patch)
tree7bf9476fafe01ab1611ea7aa21149b1c35a73e9e
parent36b08b819713e587fa43b94516302dd8732dd27a (diff)
watchdog: mei_wdt: request stop on reboot to prevent false positive event
commit 9eff1140a82db8c5520f76e51c21827b4af670b3 upstream. Systemd on reboot enables shutdown watchdog that leaves the watchdog device open to ensure that even if power down process get stuck the platform reboots nonetheless. The iamt_wdt is an alarm-only watchdog and can't reboot system, but the FW will generate an alarm event reboot was completed in time, as the watchdog is not automatically disabled during power cycle. So we should request stop watchdog on reboot to eliminate wrong alarm from the FW. Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/watchdog/mei_wdt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/watchdog/mei_wdt.c b/drivers/watchdog/mei_wdt.c
index 630bd189f167..2a9d5cdedea2 100644
--- a/drivers/watchdog/mei_wdt.c
+++ b/drivers/watchdog/mei_wdt.c
@@ -389,6 +389,8 @@ static int mei_wdt_register(struct mei_wdt *wdt)
389 wdt->wdd.max_timeout = MEI_WDT_MAX_TIMEOUT; 389 wdt->wdd.max_timeout = MEI_WDT_MAX_TIMEOUT;
390 390
391 watchdog_set_drvdata(&wdt->wdd, wdt); 391 watchdog_set_drvdata(&wdt->wdd, wdt);
392 watchdog_stop_on_reboot(&wdt->wdd);
393
392 ret = watchdog_register_device(&wdt->wdd); 394 ret = watchdog_register_device(&wdt->wdd);
393 if (ret) { 395 if (ret) {
394 dev_err(dev, "unable to register watchdog device = %d.\n", ret); 396 dev_err(dev, "unable to register watchdog device = %d.\n", ret);