]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
watchdog: omap_wdt: Fix WDT reloading
authorMarek Vasut <marex@denx.de>
Fri, 24 Jan 2020 04:44:24 +0000 (05:44 +0100)
committerLokesh Vutla <lokeshvutla@ti.com>
Tue, 4 Feb 2020 03:37:24 +0000 (09:07 +0530)
The watchdog timer value was never updated in the hardware by this
driver, so the watchdog triggered on some random stale value that
was left in the hardware. The TI SPRUH37C says, quote:

  20.4.3.9 Modifying Timer Count/Load Values and Prescaler Setting
  ...
  After a write access, the load register value and prescaler ratio
  registers are updated immediately, but new values are considered
  only after the next consecutive counter overflow or after a new
  trigger command (the WDT_WTGR register).

This means at least one trigger must happen. The driver probably
depended on someone calling it's .reset() callback, however that
is not guaranteed e.g. if the WDT operates without servicing.

Add this missing trigger.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Sam Protsenko <semen.protsenko@linaro.org>
Cc: Suniel Mahesh <sunil.m@techveda.org>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
drivers/watchdog/omap_wdt.c

index b9cdf700363ee70c2a06e6ab7ee5b7fc3f0bb336..85425ca50574532d55df6a797109f7892df97547 100644 (file)
@@ -219,6 +219,16 @@ static int omap3_wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags)
        while ((readl(&priv->regs->wdtwwps)) & WDT_WWPS_PEND_WSPR)
                ;
 
+       /* Trigger the watchdog to actually reload the counter. */
+       while ((readl(&priv->regs->wdtwwps)) & WDT_WWPS_PEND_WTGR)
+               ;
+
+       priv->wdt_trgr_pattern = ~(priv->wdt_trgr_pattern);
+       writel(priv->wdt_trgr_pattern, &priv->regs->wdtwtgr);
+
+       while ((readl(&priv->regs->wdtwwps)) & WDT_WWPS_PEND_WTGR)
+               ;
+
        return 0;
 }