Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1409813 > unrolled thread

[PATCH 2/3] sbsa_gwdt: Use max_hw_heartbeat_ms instead of max_timeout

Started byfu.wei@linaro.org
First post2016-05-31 08:10 +0200
Last post2016-06-01 23:50 +0200
Articles 2 — 2 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.


Contents

  [PATCH 2/3] sbsa_gwdt: Use max_hw_heartbeat_ms instead of max_timeout fu.wei@linaro.org - 2016-05-31 08:10 +0200
    Re: [PATCH 2/3] sbsa_gwdt: Use max_hw_heartbeat_ms instead of  max_timeout Guenter Roeck <linux@roeck-us.net> - 2016-06-01 23:50 +0200

#1409813 — [PATCH 2/3] sbsa_gwdt: Use max_hw_heartbeat_ms instead of max_timeout

Fromfu.wei@linaro.org
Date2016-05-31 08:10 +0200
Subject[PATCH 2/3] sbsa_gwdt: Use max_hw_heartbeat_ms instead of max_timeout
Message-ID<rEL2h-75S-5@gated-at.bofh.it>
From: Pratyush Anand <panand@redhat.com>

Using max_hw_heartbeat_ms instead of max_timeout gives the flexibility to
achieve higher user "timeout". Therefore, use this new infrastructure.

Signed-off-by: Pratyush Anand <panand@redhat.com>
Signed-off-by: Fu Wei <fu.wei@linaro.org>
---
 drivers/watchdog/sbsa_gwdt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c
index ad383f6..6af71e0 100644
--- a/drivers/watchdog/sbsa_gwdt.c
+++ b/drivers/watchdog/sbsa_gwdt.c
@@ -273,7 +273,7 @@ static int sbsa_gwdt_probe(struct platform_device *pdev)
 	wdd->info = &sbsa_gwdt_info;
 	wdd->ops = &sbsa_gwdt_ops;
 	wdd->min_timeout = 1;
-	wdd->max_timeout = U32_MAX / gwdt->clk;
+	wdd->max_hw_heartbeat_ms = U32_MAX / gwdt->clk * 1000;
 	wdd->timeout = DEFAULT_TIMEOUT;
 	watchdog_set_drvdata(wdd, gwdt);
 	watchdog_set_nowayout(wdd, nowayout);
@@ -310,7 +310,7 @@ static int sbsa_gwdt_probe(struct platform_device *pdev)
 	 * the timeout is (WOR * 2), so the maximum timeout should be doubled.
 	 */
 	if (!action)
-		wdd->max_timeout *= 2;
+		wdd->max_hw_heartbeat_ms *= 2;
 
 	watchdog_init_timeout(wdd, timeout, dev);
 	/*
-- 
2.5.5

[toc] | [next] | [standalone]


#1411563 — Re: [PATCH 2/3] sbsa_gwdt: Use max_hw_heartbeat_ms instead of max_timeout

FromGuenter Roeck <linux@roeck-us.net>
Date2016-06-01 23:50 +0200
SubjectRe: [PATCH 2/3] sbsa_gwdt: Use max_hw_heartbeat_ms instead of max_timeout
Message-ID<rFmbw-5DL-31@gated-at.bofh.it>
In reply to#1409813
On Tue, May 31, 2016 at 02:08:09PM +0800, fu.wei@linaro.org wrote:
> From: Pratyush Anand <panand@redhat.com>
> 
> Using max_hw_heartbeat_ms instead of max_timeout gives the flexibility to
> achieve higher user "timeout". Therefore, use this new infrastructure.
> 
> Signed-off-by: Pratyush Anand <panand@redhat.com>
> Signed-off-by: Fu Wei <fu.wei@linaro.org>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  drivers/watchdog/sbsa_gwdt.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c
> index ad383f6..6af71e0 100644
> --- a/drivers/watchdog/sbsa_gwdt.c
> +++ b/drivers/watchdog/sbsa_gwdt.c
> @@ -273,7 +273,7 @@ static int sbsa_gwdt_probe(struct platform_device *pdev)
>  	wdd->info = &sbsa_gwdt_info;
>  	wdd->ops = &sbsa_gwdt_ops;
>  	wdd->min_timeout = 1;
> -	wdd->max_timeout = U32_MAX / gwdt->clk;
> +	wdd->max_hw_heartbeat_ms = U32_MAX / gwdt->clk * 1000;
>  	wdd->timeout = DEFAULT_TIMEOUT;
>  	watchdog_set_drvdata(wdd, gwdt);
>  	watchdog_set_nowayout(wdd, nowayout);
> @@ -310,7 +310,7 @@ static int sbsa_gwdt_probe(struct platform_device *pdev)
>  	 * the timeout is (WOR * 2), so the maximum timeout should be doubled.
>  	 */
>  	if (!action)
> -		wdd->max_timeout *= 2;
> +		wdd->max_hw_heartbeat_ms *= 2;
>  
>  	watchdog_init_timeout(wdd, timeout, dev);
>  	/*
> -- 
> 2.5.5
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web