From: Jacky Bai <ping.bai@xxxxxxx> Add explict memory barrier for the wdog unlock sequence. Suggested-by: Ye Li <ye.li@xxxxxxx> Signed-off-by: Jacky Bai <ping.bai@xxxxxxx> Signed-off-by: Alice Guo <alice.guo@xxxxxxx> Reviewed-by: Ye Li <ye.li@xxxxxxx> --- drivers/watchdog/imx7ulp_wdt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/watchdog/imx7ulp_wdt.c b/drivers/watchdog/imx7ulp_wdt.c index 014f497ea0dc..b8ac0cb04d2f 100644 --- a/drivers/watchdog/imx7ulp_wdt.c +++ b/drivers/watchdog/imx7ulp_wdt.c @@ -179,9 +179,13 @@ static int imx7ulp_wdt_init(void __iomem *base, unsigned int timeout) int ret; local_irq_disable(); + + mb(); /* unlock the wdog for reconfiguration */ writel_relaxed(UNLOCK_SEQ0, base + WDOG_CNT); writel_relaxed(UNLOCK_SEQ1, base + WDOG_CNT); + mb(); + ret = imx7ulp_wdt_wait(base, WDOG_CS_ULK); if (ret) goto init_out; -- 2.17.1
