Commit e7dc481c authored by Tao Ren's avatar Tao Ren Committed by Wim Van Sebroeck
Browse files

watchdog: aspeed: fix hardware timeout calculation 



Fix hardware timeout calculation in aspeed_wdt_set_timeout function to
ensure the reload value does not exceed the hardware limit.

Fixes: efa859f7 ("watchdog: Add Aspeed watchdog driver")
Reported-by: default avatarAmithash Prasad <amithash@fb.com>
Signed-off-by: default avatarTao Ren <rentao.bupt@gmail.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20210417034249.5978-1-rentao.bupt@gmail.com


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
parent 01028829

drivers/watchdog/aspeed_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -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);