| Message ID | 20230819084726.11037-1-othacehe@gnu.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | watchdog: sama5d4: readout initial state | expand |
On Sat, Aug 19, 2023 at 10:47:26AM +0200, Mathieu Othacehe wrote: > Readout the AT91_WDT_MR bit at probe so that it becomes possible to get the > pre-userspace handler working. > > Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/watchdog/sama5d4_wdt.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c > index aeee934ca51b..7d31bb6f6204 100644 > --- a/drivers/watchdog/sama5d4_wdt.c > +++ b/drivers/watchdog/sama5d4_wdt.c > @@ -255,6 +255,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev) > struct sama5d4_wdt *wdt; > void __iomem *regs; > u32 irq = 0; > + u32 reg; > int ret; > > wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL); > @@ -305,6 +306,12 @@ static int sama5d4_wdt_probe(struct platform_device *pdev) > > watchdog_init_timeout(wdd, wdt_timeout, dev); > > + reg = wdt_read(wdt, AT91_WDT_MR); > + if (!(reg & AT91_WDT_WDDIS)) { > + wdt->mr &= ~AT91_WDT_WDDIS; > + set_bit(WDOG_HW_RUNNING, &wdd->status); > + } > + > ret = sama5d4_wdt_init(wdt); > if (ret) > return ret; > -- > 2.41.0 >
diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c index aeee934ca51b..7d31bb6f6204 100644 --- a/drivers/watchdog/sama5d4_wdt.c +++ b/drivers/watchdog/sama5d4_wdt.c @@ -255,6 +255,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev) struct sama5d4_wdt *wdt; void __iomem *regs; u32 irq = 0; + u32 reg; int ret; wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL); @@ -305,6 +306,12 @@ static int sama5d4_wdt_probe(struct platform_device *pdev) watchdog_init_timeout(wdd, wdt_timeout, dev); + reg = wdt_read(wdt, AT91_WDT_MR); + if (!(reg & AT91_WDT_WDDIS)) { + wdt->mr &= ~AT91_WDT_WDDIS; + set_bit(WDOG_HW_RUNNING, &wdd->status); + } + ret = sama5d4_wdt_init(wdt); if (ret) return ret;
Readout the AT91_WDT_MR bit at probe so that it becomes possible to get the pre-userspace handler working. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> --- drivers/watchdog/sama5d4_wdt.c | 7 +++++++ 1 file changed, 7 insertions(+)