| From b5a4eda61787c9e2c3bea3c5949799966ce07f5d Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 16 Apr 2021 20:42:49 -0700 |
| Subject: watchdog: aspeed: fix hardware timeout calculation |
| |
| From: Tao Ren <rentao.bupt@gmail.com> |
| |
| [ Upstream commit e7dc481c92060f9ce872878b0b7a08c24713a7e5 ] |
| |
| 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> |
| Link: https://lore.kernel.org/r/20210417034249.5978-1-rentao.bupt@gmail.com |
| Signed-off-by: Guenter Roeck <linux@roeck-us.net> |
| Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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.30.2 |
| |
