On Thu, Apr 11, 2019 at 09:14:37PM +0200, Alexandre Belloni wrote: > Readout the enabled state so it is possible to get the pre-userspace > handler working. Also, avoid disabling the watchdog to ensure it continues > working and triggers if there is an issue later in the boot or if userspace > fails to start. > > Signed-off-by: Alexandre Belloni <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]> > --- > drivers/watchdog/pnx4008_wdt.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c > index 8e261799c84e..4ce0389d1442 100644 > --- a/drivers/watchdog/pnx4008_wdt.c > +++ b/drivers/watchdog/pnx4008_wdt.c > @@ -209,7 +209,8 @@ static int pnx4008_wdt_probe(struct platform_device *pdev) > watchdog_set_nowayout(&pnx4008_wdd, nowayout); > watchdog_set_restart_priority(&pnx4008_wdd, 128); > > - pnx4008_wdt_stop(&pnx4008_wdd); /* disable for now */ > + if (readl(WDTIM_CTRL(wdt_base)) & COUNT_ENAB) > + set_bit(WDOG_HW_RUNNING, &pnx4008_wdd.status); > > ret = watchdog_register_device(&pnx4008_wdd); > if (ret < 0) { > -- > 2.20.1 >
