This is a note to let you know that I've just added the patch titled
watchdog: sbsa_wdog: Make sure the timeout programming is within the limits
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
watchdog-sbsa_wdog-make-sure-the-timeout-programming-is-within-the-limits.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 000987a38b53c172f435142a4026dd71378ca464 Mon Sep 17 00:00:00 2001
From: George Cherian <george.cherian@xxxxxxxxxxx>
Date: Thu, 9 Feb 2023 02:11:17 +0000
Subject: watchdog: sbsa_wdog: Make sure the timeout programming is within the limits
From: George Cherian <george.cherian@xxxxxxxxxxx>
commit 000987a38b53c172f435142a4026dd71378ca464 upstream.
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@xxxxxxxxxxx>
Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20230209021117.1512097-1-george.cherian@xxxxxxxxxxx
Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx>
Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Tyler Hicks (Microsoft) <code@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/watchdog/sbsa_gwdt.c | 1 +
1 file changed, 1 insertion(+)
--- a/drivers/watchdog/sbsa_gwdt.c
+++ b/drivers/watchdog/sbsa_gwdt.c
@@ -121,6 +121,7 @@ static int sbsa_gwdt_set_timeout(struct
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)
writel(gwdt->clk * timeout,
Patches currently in stable-queue which might be from george.cherian@xxxxxxxxxxx are
queue-5.4/watchdog-sbsa_wdog-make-sure-the-timeout-programming-is-within-the-limits.patch
