Skip to contentSkip to conversation

MIPS: Fix sibyte watchdog initialization

PATCH/RESEND Guenter Roeck 3 participants 4 messages Apr 19, 2010 Watchdog device drivers

lore
Share & tools
lore
#0 lore raw

Watchdog configuration register and timer count register were interchanged, causing wrong values to be written into both registers.
This caused watchdog triggered resets even if the watchdog was reset in time.

---
Resend:
Widening the audience.
Please let me know if there are any problems with this patch.

 drivers/watchdog/sb_wdog.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/watchdog/sb_wdog.c +2 -2
index 9748eed..1407cfa 100644
@@ -67,8 +67,8 @@ static DEFINE_SPINLOCK(sbwd_lock);
 void sbwdog_set(char __iomem *wdog, unsigned long t)
 {
 	spin_lock(&sbwd_lock);
-	__raw_writeb(0, wdog - 0x10);
-	__raw_writeq(t & 0x7fffffUL, wdog);
+	__raw_writeb(0, wdog);
+	__raw_writeq(t & 0x7fffffUL, wdog - 0x10);
 	spin_unlock(&sbwd_lock);
 }
 
Signature · 1 line
1.7.0.87.g0901d
#1 lore raw
Quoted 9 lines · Guenter Roeck

Watchdog configuration register and timer count register were interchanged, causing wrong values to be written into both registers.
This caused watchdog triggered resets even if the watchdog was reset in time.

---
Resend:
Widening the audience.
Please let me know if there are any problems with this patch.

For the new audience, this patch has been previously posted to linux-mips a few days ago and assuming there are no objections I'd like to merge it upstream for 2.6.34, so an Ack would by nice.

Ralf

#3 lore raw
Quoted 6 lines · Wim Van Sebroeck

Hi Guenter,

Quoted 4 lines

Watchdog configuration register and timer count register were interchanged, causing wrong values to be written into both registers.
This caused watchdog triggered resets even if the watchdog was reset in time.

Quoted 6 lines
Quoted 1 line

Just let me know when this can be added as a fix in the watchdog tree.

The earlier the better from my perspective.

Ralf may have had the mips tree in mind - might make sense to synchronize with him.

Thanks,
Guenter