Merge tag 'linux-watchdog-5.7-rc2' of git://www.linux-watchdog.org/linux-watchdog

torvalds · torvalds · commit 1634615dc14d · 2020-04-17T11:40:08.000-07:00
Pull watchdog fix from Wim Van Sebroeck: "Fix restart handler in sp805 driver" * tag 'linux-watchdog-5.7-rc2' of git://www.linux-watchdog.org/linux-watchdog: watchdog: sp805: fix restart handler
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
@@ -137,10 +137,14 @@ wdt_restart(struct watchdog_device *wdd, unsigned long mode, void *cmd)
 {
 	struct sp805_wdt *wdt = watchdog_get_drvdata(wdd);
 
+	writel_relaxed(UNLOCK, wdt->base + WDTLOCK);
 	writel_relaxed(0, wdt->base + WDTCONTROL);
 	writel_relaxed(0, wdt->base + WDTLOAD);
 	writel_relaxed(INT_ENABLE | RESET_ENABLE, wdt->base + WDTCONTROL);
 
+	/* Flush posted writes. */
+	readl_relaxed(wdt->base + WDTLOCK);
+
 	return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -137,10 +137,14 @@ wdt_restart(struct watchdog_device wdd, unsigned long mode, void cmd)`
`137`	`137`	`{`
`138`	`138`	`struct sp805_wdt *wdt = watchdog_get_drvdata(wdd);`
`139`	`139`
	`140`	`+ writel_relaxed(UNLOCK, wdt->base + WDTLOCK);`
`140`	`141`	`writel_relaxed(0, wdt->base + WDTCONTROL);`
`141`	`142`	`writel_relaxed(0, wdt->base + WDTLOAD);`
`142`	`143`	`writel_relaxed(INT_ENABLE \| RESET_ENABLE, wdt->base + WDTCONTROL);`
`143`	`144`
	`145`	`+ /* Flush posted writes. */`
	`146`	`+ readl_relaxed(wdt->base + WDTLOCK);`
	`147`	`+`
`144`	`148`	`return 0;`
`145`	`149`	`}`
`146`	`150`