Re: [PATCH v2] watchdog: sbsa_wdog: Make sure the timeout programming is within the limits

[Guenter Roeck <linux@roeck-us.net>]

On 2/8/23 00:37, George Cherian wrote:
> 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>
> ---
>   drivers/watchdog/sbsa_gwdt.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c
> index 9791c74aebd4..ee1039a652f1 100644
> --- a/drivers/watchdog/sbsa_gwdt.c
> +++ b/drivers/watchdog/sbsa_gwdt.c
> @@ -149,6 +149,7 @@ static int sbsa_gwdt_set_timeout(struct watchdog_device *wdd,
>   {
>   	struct sbsa_gwdt *gwdt = watchdog_get_drvdata(wdd);
>   
> +	timeout = clamp_t(unsigned int, timeout, 1, wdd->max_hw_heartbeat_ms / 1000);
>   	wdd->timeout = timeout;
>   

Wrong order. wdd->timeout should still contain the requested timeout.

Guenter