]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
watchdog: sbsa_wdog: Make sure the timeout programming is within the limits
authorGeorge Cherian <george.cherian@marvell.com>
Thu, 9 Feb 2023 02:11:17 +0000 (02:11 +0000)
committerAndrea Righi <andrea.righi@canonical.com>
Tue, 14 Mar 2023 15:47:51 +0000 (16:47 +0100)
BugLink: https://bugs.launchpad.net/bugs/2011430
[ Upstream commit 000987a38b53c172f435142a4026dd71378ca464 ]

Make sure to honour the max_hw_heartbeat_ms while programming the timeout
value to WOR. Clamp the timeout passed to sbsa_gwdt_set_timeout() to
make sure the programmed value is within the permissible range.

Fixes: abd3ac7902fb ("watchdog: sbsa: Support architecture version 1")
Signed-off-by: George Cherian <george.cherian@marvell.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20230209021117.1512097-1-george.cherian@marvell.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/watchdog/sbsa_gwdt.c

index 9791c74aebd489a3fee2efc388ace4adb24eda15..63862803421f12d656ea48c7d47f53fafb850aeb 100644 (file)
@@ -150,6 +150,7 @@ static int sbsa_gwdt_set_timeout(struct watchdog_device *wdd,
        struct sbsa_gwdt *gwdt = watchdog_get_drvdata(wdd);
 
        wdd->timeout = timeout;
+       timeout = clamp_t(unsigned int, timeout, 1, wdd->max_hw_heartbeat_ms / 1000);
 
        if (action)
                sbsa_gwdt_reg_write(gwdt->clk * timeout, gwdt);