Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e39a623 authored by George Cherian's avatar George Cherian Committed by Greg Kroah-Hartman
Browse files

watchdog: sbsa_wdog: Make sure the timeout programming is within the limits 



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: default avatarGeorge Cherian <george.cherian@marvell.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20230209021117.1512097-1-george.cherian@marvell.com


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
Signed-off-by: default avatarTyler Hicks (Microsoft) <code@tyhicks.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 30e138e2

drivers/watchdog/sbsa_gwdt.c

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,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)

		writel(gwdt->clk * timeout,