Commit dbe80cf4 authored by Jan Kiszka's avatar Jan Kiszka Committed by Wim Van Sebroeck
Browse files

watchdog: Start watchdog in watchdog_set_last_hw_keepalive only if appropriate 



We must not pet a running watchdog when handle_boot_enabled is off
because this will kick off automatic triggering before userland is
running, defeating the purpose of the handle_boot_enabled control.
Furthermore, don't ping in case watchdog_set_last_hw_keepalive was
called incorrectly when the hardware watchdog is actually not running.

Fixed: cef9572e ("watchdog: add support for adjusting last known HW keepalive time")
Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/93d56386-6e37-060b-55ce-84de8cde535f@web.de


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent 585ba602

drivers/watchdog/watchdog_dev.c

+4 −1
Original line number Diff line number Diff line
@@ -1173,7 +1173,10 @@ int watchdog_set_last_hw_keepalive(struct watchdog_device *wdd, 


	wd_data->last_hw_keepalive = ktime_sub(now, ms_to_ktime(last_ping_ms));



	if (watchdog_hw_running(wdd) && handle_boot_enabled)

		return __watchdog_ping(wdd);



	return 0;

}

EXPORT_SYMBOL_GPL(watchdog_set_last_hw_keepalive);