Skip to content

Commit 6371593

Browse files
JackyBaiWim Van Sebroeck
authored andcommitted
watchdog: imx7ulp: Add explict memory barrier for unlock sequence
When reconfiguring the WDOG Timer of i.MX7ULP, there is a certain probability causes it to reset. The reason is that the CMD32EN of the WDOG Timer of i.MX7ULP is disabled in bootloader. The unlock sequence are two 16-bit writes to the CNT register within 16 bus clocks. Adding mb() is to guarantee that two 16-bit writes are finished within 16 bus clocks. Memory barriers cannot be added between these two 16-bit writes so that writel_relaxed is used. Suggested-by: Ye Li <[email protected]> Signed-off-by: Jacky Bai <[email protected]> Signed-off-by: Alice Guo <[email protected]> Reviewed-by: Ye Li <[email protected]> Reviewed-by: Guenter Roeck <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Guenter Roeck <[email protected]> Signed-off-by: Wim Van Sebroeck <[email protected]>
1 parent f182683 commit 6371593

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/watchdog/imx7ulp_wdt.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,13 @@ static int imx7ulp_wdt_init(void __iomem *base, unsigned int timeout)
179179
int ret;
180180

181181
local_irq_disable();
182+
183+
mb();
182184
/* unlock the wdog for reconfiguration */
183185
writel_relaxed(UNLOCK_SEQ0, base + WDOG_CNT);
184186
writel_relaxed(UNLOCK_SEQ1, base + WDOG_CNT);
187+
mb();
188+
185189
ret = imx7ulp_wdt_wait(base, WDOG_CS_ULK);
186190
if (ret)
187191
goto init_out;

0 commit comments

Comments
 (0)