]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
watchdog: mei_wdt: request stop on unregister
authorAlexander Usyskin <alexander.usyskin@intel.com>
Sun, 24 Jan 2021 11:49:38 +0000 (13:49 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Mar 2021 17:22:54 +0000 (18:22 +0100)
commit 740c0a57b8f1e36301218bf549f3c9cc833a60be upstream.

The MEI bus has a special behavior on suspend it destroys
all the attached devices, this is due to the fact that also
firmware context is not persistent across power flows.

If watchdog on MEI bus is ticking before suspending the firmware
times out and reports that the OS is missing watchdog tick.
Send the stop command to the firmware on watchdog unregistered
to eliminate the false event on suspend.
This does not make the things worse from the user-space perspective
as a user-space should re-open watchdog device after
suspending before this patch.

Cc: <stable@vger.kernel.org>
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>
Link: https://lore.kernel.org/r/20210124114938.373885-1-tomas.winkler@intel.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/watchdog/mei_wdt.c

index ea60b29494fb693bf7898e3f456b6ff8e9dfdb6f..dc70db243ffb5009efff7744ef19e7750ca99346 100644 (file)
@@ -390,6 +390,7 @@ static int mei_wdt_register(struct mei_wdt *wdt)
 
        watchdog_set_drvdata(&wdt->wdd, wdt);
        watchdog_stop_on_reboot(&wdt->wdd);
+       watchdog_stop_on_unregister(&wdt->wdd);
 
        ret = watchdog_register_device(&wdt->wdd);
        if (ret) {