MIPS: Fix sibyte watchdog initialization
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
@@ -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
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.Signed-off-by Guenter Roeck <[email protected]>---
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
Hi Guenter,
Quoted 5 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.Signed-off-by Guenter Roeck <[email protected]>
Just let me know when this can be added as a fix in the watchdog tree.
Kind regards,
Wim.
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
Signed-off-by Guenter Roeck <[email protected]>Signed-off-by Wim Van Sebroeck <[email protected]>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