Skip to contentSkip to conversation

imx_watchdog: always set minimal timeout in reset_cpu

PATCH New Andrey Skvortsov 2 participants 2 messages Dec 20, 2015 – Jan 7, 2016

Subsystems (2)
Arm i.MX and Layerscape Watchdog device drivers
lore
Share & tools
lore

Andrey Skvortsov

author
#0 lore raw

PATCH 1/1 imx_watchdog: always set minimal timeout in reset_cpu

The problem is that timeout bits in WCR register were leaved unchanged. So previously set timeout value was applied and therefore 'reset' command takes any value up to two minutes, depending on previous watchdog settings, instead of minimal 0.5 seconds.

Signed-off-by Andrey Skvortsov <[email protected]>
---
 drivers/watchdog/imx_watchdog.c | 2 +-
 include/fsl_wdog.h              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/watchdog/imx_watchdog.c +1 -1
index 0d77595..f9f8175 100644
@@ -43,7 +43,7 @@ void reset_cpu(ulong addr)
 {
 	struct watchdog_regs *wdog = (struct watchdog_regs *)WDOG1_BASE_ADDR;
 
-	clrsetbits_le16(&wdog->wcr, 0, WCR_WDE);
+	clrsetbits_le16(&wdog->wcr, WCR_WT_MSK, WCR_WDE);
 
 	writew(0x5555, &wdog->wsr);
 	writew(0xaaaa, &wdog->wsr);	/* load minimum 1/2 second timeout */
include/fsl_wdog.h +1 -0
index d15a70c..f698d4d 100644
@@ -16,3 +16,4 @@ struct watchdog_regs {
 #define WCR_WDT		0x08
 #define WCR_SRS		0x10
 #define SET_WCR_WT(x)	(x << 8)
+#define WCR_WT_MSK	SET_WCR_WT(0xFF)
Signature · 1 line
2.6.4
#1 lore raw

PATCH 1/1 imx_watchdog: always set minimal timeout in reset_cpu

Quoted 7 lines · Andrey Skvortsov

The problem is that timeout bits in WCR register were leaved unchanged. So previously set timeout value was applied and therefore 'reset' command takes any value up to two minutes, depending on previous watchdog settings, instead of minimal 0.5 seconds.

Signed-off-by Andrey Skvortsov <[email protected]>

---

Applied (fix) to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================