Skip to contentSkip to conversation

powerpc: Fix Book-E watchdog timer interval setting

PATCH Applied Matthias Fuchs 3 participants 3 messages Nov 5, 2008 – Nov 8, 2008 Watchdog device drivers

lore
Share & tools
lore

Matthias Fuchs

author
#0 lore raw

PATCH v3 1/1 powerpc: Fix Book-E watchdog timer interval setting

This patch fixes the setting of the Book-E watchdog timer interval setup on initialization and by ioctl().

On initialization the period bits have to be masked before setting a new period.

In WDIOC_SETTIMEOUT ioctl we have to use the correct mask.

Signed-off-by Matthias Fuchs <[email protected]>
---
 drivers/watchdog/booke_wdt.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
drivers/watchdog/booke_wdt.c +4 -1
index c3b78a7..225398f 100644
@@ -42,8 +42,10 @@ u32 booke_wdt_period = WDT_PERIOD_DEFAULT;
 
 #ifdef	CONFIG_FSL_BOOKE
 #define WDTP(x)		((((63-x)&0x3)<<30)|(((63-x)&0x3c)<<15))
+#define WDTP_MASK	(WDTP(0))
 #else
 #define WDTP(x)		(TCR_WP(x))
+#define WDTP_MASK	(TCR_WP_MASK)
 #endif
 
 static DEFINE_SPINLOCK(booke_wdt_lock);

@@ -65,6 +67,7 @@ static void __booke_wdt_enable(void *data)
 	/* clear status before enabling watchdog */
 	__booke_wdt_ping(NULL);
 	val = mfspr(SPRN_TCR);
+	val &= ~WDTP_MASK;
 	val |= (TCR_WIE|TCR_WRC(WRC_CHIP)|WDTP(booke_wdt_period));
 
 	mtspr(SPRN_TCR, val);

@@ -114,7 +117,7 @@ static long booke_wdt_ioctl(struct file *file,
 	case WDIOC_SETTIMEOUT:
 		if (get_user(booke_wdt_period, p))
 			return -EFAULT;
-		mtspr(SPRN_TCR, (mfspr(SPRN_TCR) & ~WDTP(0)) |
+		mtspr(SPRN_TCR, (mfspr(SPRN_TCR) & ~WDTP_MASK) |
 						WDTP(booke_wdt_period));
 		return 0;
 	case WDIOC_GETTIMEOUT:
Signature · 1 line
1.5.3
Acked-by on v3 1/1
#1 lore raw
Quoted 9 lines · Matthias Fuchs

This patch fixes the setting of the Book-E watchdog timer interval setup on initialization and by ioctl().

On initialization the period bits have to be masked before setting a new period.

In WDIOC_SETTIMEOUT ioctl we have to use the correct mask.

Signed-off-by Matthias Fuchs <[email protected]>
Acked-by Timur Tabi <[email protected]>
Signature · 2 lines
Timur Tabi
Linux kernel developer at Freescale
Applied
#2 lore raw
In reply to Matthias Fuchs
Quoted 6 lines · Matthias Fuchs

This patch fixes the setting of the Book-E watchdog timer interval setup on initialization and by ioctl().

On initialization the period bits have to be masked before setting a new period.

Quoted 6 lines

In WDIOC_SETTIMEOUT ioctl we have to use the correct mask.

Signed-off-by Matthias Fuchs <[email protected]>

---
drivers/watchdog/booke_wdt.c | 5 ++++-

1 files changed, 4 insertions(+), 1 deletions(-)

applied to merge

- k