| From ed54143a8e736892b1f41b9cd65937e8eacb808d Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 14 Oct 2021 12:22:29 +0200 |
| Subject: watchdog: Fix OMAP watchdog early handling |
| |
| From: Walter Stoll <walter.stoll@duagon.com> |
| |
| [ Upstream commit cd004d8299f1dc6cfa6a4eea8f94cb45eaedf070 ] |
| |
| TI's implementation does not service the watchdog even if the kernel |
| command line parameter omap_wdt.early_enable is set to 1. This patch |
| fixes the issue. |
| |
| Signed-off-by: Walter Stoll <walter.stoll@duagon.com> |
| Reviewed-by: Guenter Roeck <linux@roeck-us.net> |
| Link: https://lore.kernel.org/r/88a8fe5229cd68fa0f1fd22f5d66666c1b7057a0.camel@duagon.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/omap_wdt.c | 6 +++++- |
| 1 file changed, 5 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c |
| index 9b91882fe3c41..6d7ccbc0b666c 100644 |
| --- a/drivers/watchdog/omap_wdt.c |
| +++ b/drivers/watchdog/omap_wdt.c |
| @@ -268,8 +268,12 @@ static int omap_wdt_probe(struct platform_device *pdev) |
| wdev->wdog.bootstatus = WDIOF_CARDRESET; |
| } |
| |
| - if (!early_enable) |
| + if (early_enable) { |
| + omap_wdt_start(&wdev->wdog); |
| + set_bit(WDOG_HW_RUNNING, &wdev->wdog.status); |
| + } else { |
| omap_wdt_disable(wdev); |
| + } |
| |
| ret = watchdog_register_device(&wdev->wdog); |
| if (ret) { |
| -- |
| 2.33.0 |
| |
