Subject: [PATCH] watchdog: make DesignWare watchdog allow users to set bigger timeout value

From d21d084122d08816454a1e338f0946a9da1f81e3 Mon Sep 17 00:00:00 2001
From: Peng Wang <[email protected]>
Date: Wed, 20 Nov 2019 15:12:59 +0800
Subject: [PATCH] watchdog: make DesignWare watchdog allow users to set bigger
timeout value

watchdog_dev.c provides means to allow users to set bigger timeout value
than HW can support, make DesignWare watchdog align with this.

Signed-off-by: Peng Wang <[email protected]>
---
drivers/watchdog/dw_wdt.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
index fef7c61..f1a431c 100644
--- a/drivers/watchdog/dw_wdt.c
+++ b/drivers/watchdog/dw_wdt.c
@@ -114,7 +114,15 @@ static int dw_wdt_set_timeout(struct watchdog_device *wdd, unsigned int top_s)
writel(top_val | top_val << WDOG_TIMEOUT_RANGE_TOPINIT_SHIFT,
dw_wdt->regs + WDOG_TIMEOUT_RANGE_REG_OFFSET);

- wdd->timeout = dw_wdt_top_in_seconds(dw_wdt, top_val);
+ /*
+ * In case users set bigger timeout value than HW can support,
+ * kernel(watchdog_dev.c) helps to feed watchdog before
+ * wdd->timeout
+ */
+ if ( top_s * 1000 <= wdd->max_hw_heartbeat_ms )
+ wdd->timeout = dw_wdt_top_in_seconds(dw_wdt, top_val);
+ else
+ wdd->timeout = top_s;

return 0;
}
--
1.8.3.1


2019-11-21 09:58:51

by Guenter Roeck

[permalink] [raw]
Subject: Re: [PATCH] watchdog: make DesignWare watchdog allow users to set bigger timeout value

On 11/21/19 12:21 AM, Wang, Peng 1. (NSB - CN/Hangzhou) wrote:
>>From d21d084122d08816454a1e338f0946a9da1f81e3 Mon Sep 17 00:00:00 2001
> From: Peng Wang <[email protected]>
> Date: Wed, 20 Nov 2019 15:12:59 +0800
> Subject: [PATCH] watchdog: make DesignWare watchdog allow users to set bigger
> timeout value
>
> watchdog_dev.c provides means to allow users to set bigger timeout value
> than HW can support, make DesignWare watchdog align with this.
>
> Signed-off-by: Peng Wang <[email protected]>
> ---

Please version your patches, and add a change log here.

> drivers/watchdog/dw_wdt.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
> index fef7c61..f1a431c 100644
> --- a/drivers/watchdog/dw_wdt.c
> +++ b/drivers/watchdog/dw_wdt.c
> @@ -114,7 +114,15 @@ static int dw_wdt_set_timeout(struct watchdog_device *wdd, unsigned int top_s)
> writel(top_val | top_val << WDOG_TIMEOUT_RANGE_TOPINIT_SHIFT,
> dw_wdt->regs + WDOG_TIMEOUT_RANGE_REG_OFFSET);
>
> - wdd->timeout = dw_wdt_top_in_seconds(dw_wdt, top_val);
> + /*
> + * In case users set bigger timeout value than HW can support,
> + * kernel(watchdog_dev.c) helps to feed watchdog before
> + * wdd->timeout

No, before wdd->max_hw_heartbeat_ms.

> + */
> + if ( top_s * 1000 <= wdd->max_hw_heartbeat_ms )
> + wdd->timeout = dw_wdt_top_in_seconds(dw_wdt, top_val);
> + else
> + wdd->timeout = top_s;
>
> return 0;
> }
>