* [PATCH] watchdog: aspeed: fix hardware timeout calculation
@ 2021-04-17 3:42 rentao.bupt
2021-04-17 4:20 ` Guenter Roeck
0 siblings, 1 reply; 5+ messages in thread
From: rentao.bupt @ 2021-04-17 3:42 UTC (permalink / raw)
To: Wim Van Sebroeck, Guenter Roeck, Joel Stanley, Andrew Jeffery,
linux-watchdog, linux-arm-kernel, linux-aspeed, linux-kernel,
openbmc, Tao Ren, Amithash Prasad
Cc: Tao Ren
From: Tao Ren <rentao.bupt@gmail.com>
Fix hardware timeout calculation in aspeed_wdt_set_timeout function to
ensure the reload value does not exceed the hardware limit.
Fixes: efa859f7d786 ("watchdog: Add Aspeed watchdog driver")
Reported-by: Amithash Prasad <amithash@fb.com>
Signed-off-by: Tao Ren <rentao.bupt@gmail.com>
---
drivers/watchdog/aspeed_wdt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c
index 7e00960651fa..507fd815d767 100644
--- a/drivers/watchdog/aspeed_wdt.c
+++ b/drivers/watchdog/aspeed_wdt.c
@@ -147,7 +147,7 @@ static int aspeed_wdt_set_timeout(struct watchdog_device *wdd,
wdd->timeout = timeout;
- actual = min(timeout, wdd->max_hw_heartbeat_ms * 1000);
+ actual = min(timeout, wdd->max_hw_heartbeat_ms / 1000);
writel(actual * WDT_RATE_1MHZ, wdt->base + WDT_RELOAD_VALUE);
writel(WDT_RESTART_MAGIC, wdt->base + WDT_RESTART);
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] watchdog: aspeed: fix hardware timeout calculation
2021-04-17 3:42 [PATCH] watchdog: aspeed: fix hardware timeout calculation rentao.bupt
@ 2021-04-17 4:20 ` Guenter Roeck
2021-05-21 1:51 ` Tao Ren
0 siblings, 1 reply; 5+ messages in thread
From: Guenter Roeck @ 2021-04-17 4:20 UTC (permalink / raw)
To: rentao.bupt
Cc: Wim Van Sebroeck, Joel Stanley, Andrew Jeffery, linux-watchdog,
linux-arm-kernel, linux-aspeed, linux-kernel, openbmc, Tao Ren,
Amithash Prasad
On Fri, Apr 16, 2021 at 08:42:49PM -0700, rentao.bupt@gmail.com wrote:
> From: Tao Ren <rentao.bupt@gmail.com>
>
> Fix hardware timeout calculation in aspeed_wdt_set_timeout function to
> ensure the reload value does not exceed the hardware limit.
>
> Fixes: efa859f7d786 ("watchdog: Add Aspeed watchdog driver")
> Reported-by: Amithash Prasad <amithash@fb.com>
> Signed-off-by: Tao Ren <rentao.bupt@gmail.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/aspeed_wdt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c
> index 7e00960651fa..507fd815d767 100644
> --- a/drivers/watchdog/aspeed_wdt.c
> +++ b/drivers/watchdog/aspeed_wdt.c
> @@ -147,7 +147,7 @@ static int aspeed_wdt_set_timeout(struct watchdog_device *wdd,
>
> wdd->timeout = timeout;
>
> - actual = min(timeout, wdd->max_hw_heartbeat_ms * 1000);
> + actual = min(timeout, wdd->max_hw_heartbeat_ms / 1000);
>
> writel(actual * WDT_RATE_1MHZ, wdt->base + WDT_RELOAD_VALUE);
> writel(WDT_RESTART_MAGIC, wdt->base + WDT_RESTART);
> --
> 2.17.1
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] watchdog: aspeed: fix hardware timeout calculation
2021-04-17 4:20 ` Guenter Roeck
@ 2021-05-21 1:51 ` Tao Ren
2021-05-21 2:44 ` Guenter Roeck
0 siblings, 1 reply; 5+ messages in thread
From: Tao Ren @ 2021-05-21 1:51 UTC (permalink / raw)
To: Guenter Roeck
Cc: Wim Van Sebroeck, Joel Stanley, Andrew Jeffery, linux-watchdog,
linux-arm-kernel, linux-aspeed, linux-kernel, openbmc, Tao Ren,
Amithash Prasad
Hi Wim,
Not sure if I looked at the wrong repository/branch, and looks like the
patch is not included. Do you have any further suggestions? Or should I
send out v2 in case it's missed?
Thanks,
Tao
On Fri, Apr 16, 2021 at 09:20:48PM -0700, Guenter Roeck wrote:
> On Fri, Apr 16, 2021 at 08:42:49PM -0700, rentao.bupt@gmail.com wrote:
> > From: Tao Ren <rentao.bupt@gmail.com>
> >
> > Fix hardware timeout calculation in aspeed_wdt_set_timeout function to
> > ensure the reload value does not exceed the hardware limit.
> >
> > Fixes: efa859f7d786 ("watchdog: Add Aspeed watchdog driver")
> > Reported-by: Amithash Prasad <amithash@fb.com>
> > Signed-off-by: Tao Ren <rentao.bupt@gmail.com>
>
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
>
> > ---
> > drivers/watchdog/aspeed_wdt.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c
> > index 7e00960651fa..507fd815d767 100644
> > --- a/drivers/watchdog/aspeed_wdt.c
> > +++ b/drivers/watchdog/aspeed_wdt.c
> > @@ -147,7 +147,7 @@ static int aspeed_wdt_set_timeout(struct watchdog_device *wdd,
> >
> > wdd->timeout = timeout;
> >
> > - actual = min(timeout, wdd->max_hw_heartbeat_ms * 1000);
> > + actual = min(timeout, wdd->max_hw_heartbeat_ms / 1000);
> >
> > writel(actual * WDT_RATE_1MHZ, wdt->base + WDT_RELOAD_VALUE);
> > writel(WDT_RESTART_MAGIC, wdt->base + WDT_RESTART);
> > --
> > 2.17.1
> >
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] watchdog: aspeed: fix hardware timeout calculation
2021-05-21 1:51 ` Tao Ren
@ 2021-05-21 2:44 ` Guenter Roeck
2021-05-21 2:59 ` Tao Ren
0 siblings, 1 reply; 5+ messages in thread
From: Guenter Roeck @ 2021-05-21 2:44 UTC (permalink / raw)
To: Tao Ren
Cc: Wim Van Sebroeck, Joel Stanley, Andrew Jeffery, linux-watchdog,
linux-arm-kernel, linux-aspeed, linux-kernel, openbmc, Tao Ren,
Amithash Prasad
On Thu, May 20, 2021 at 06:51:53PM -0700, Tao Ren wrote:
> Hi Wim,
>
> Not sure if I looked at the wrong repository/branch, and looks like the
> patch is not included. Do you have any further suggestions? Or should I
> send out v2 in case it's missed?
>
Wim didn't send a pull request in this release cycle. I have the patch in
my watchdog-next branch, so he'll hopefully pick it up from there at some
point.
Resending the patch would just create noise at this point; please don't
do that.
Guenter
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] watchdog: aspeed: fix hardware timeout calculation
2021-05-21 2:44 ` Guenter Roeck
@ 2021-05-21 2:59 ` Tao Ren
0 siblings, 0 replies; 5+ messages in thread
From: Tao Ren @ 2021-05-21 2:59 UTC (permalink / raw)
To: Guenter Roeck
Cc: Wim Van Sebroeck, Joel Stanley, Andrew Jeffery, linux-watchdog,
linux-arm-kernel, linux-aspeed, linux-kernel, openbmc, Tao Ren,
Amithash Prasad
On Thu, May 20, 2021 at 07:44:12PM -0700, Guenter Roeck wrote:
> On Thu, May 20, 2021 at 06:51:53PM -0700, Tao Ren wrote:
> > Hi Wim,
> >
> > Not sure if I looked at the wrong repository/branch, and looks like the
> > patch is not included. Do you have any further suggestions? Or should I
> > send out v2 in case it's missed?
> >
>
> Wim didn't send a pull request in this release cycle. I have the patch in
> my watchdog-next branch, so he'll hopefully pick it up from there at some
> point.
>
> Resending the patch would just create noise at this point; please don't
> do that.
>
> Guenter
Got it. Thanks Guenter.
- Tao
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-05-21 3:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-17 3:42 [PATCH] watchdog: aspeed: fix hardware timeout calculation rentao.bupt
2021-04-17 4:20 ` Guenter Roeck
2021-05-21 1:51 ` Tao Ren
2021-05-21 2:44 ` Guenter Roeck
2021-05-21 2:59 ` Tao Ren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).