Jelajahi Sumber

[WATCHDOG] max63xx: be careful when disabling the watchdog

When shutting down the watchdog timer, special care must be taken
not to overwrite other bits in the register, as it may be shared
with other peripherals.

For example, on the Arcom Vulcan, the register is shared between
the watchdog and the PCI reset line...

Signed-off-by: Marc Zyngier <maz@misterjones.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Marc Zyngier 15 tahun lalu
induk
melakukan
b1183e064a
1 mengubah file dengan 6 tambahan dan 1 penghapusan
  1. 6 1
      drivers/watchdog/max63xx_wdt.c

+ 6 - 1
drivers/watchdog/max63xx_wdt.c

@@ -154,9 +154,14 @@ static void max63xx_wdt_enable(struct max63xx_timeout *entry)
 
 
 static void max63xx_wdt_disable(void)
 static void max63xx_wdt_disable(void)
 {
 {
+	u8 val;
+
 	spin_lock(&io_lock);
 	spin_lock(&io_lock);
 
 
-	__raw_writeb(3, wdt_base);
+	val = __raw_readb(wdt_base);
+	val &= ~MAX6369_WDSET;
+	val |= 3;
+	__raw_writeb(val, wdt_base);
 
 
 	spin_unlock(&io_lock);
 	spin_unlock(&io_lock);