allow opting out of WATCHDOG_RESET() from timer interrupt

Having WATCHDOG_RESET() called automatically from the timer interrupt
runs counter to the idea of a watchdog device - if the board runs into
an infinite loops with interrupts still enabled, the watchdog will
never fire.

When using CONFIG_(SPL_)WDT, the watchdog_reset function is a lot more
complicated than just poking a few SOC-specific registers - it
involves accessing all kinds of global data, and if the interrupt
happens at the wrong time (say, in the middle of an WATCHDOG_RESET()
call from ordinary code), that can end up corrupting said global data.

Allow the board to opt out of calling WATCHDOG_RESET() from the timer
interrupt handler by setting CONFIG_SYS_WATCHDOG_FREQ to 0 - as that
setting is currently nonsensical (it would be compile-time
divide-by-zero), it cannot affect any existing boards.

Add documentation for both the existing and extended meaning of
CONFIG_SYS_WATCHDOG_FREQ.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>

diff --git a/README b/README
index a565748e43803374d8a339072389a35edab21838..ad13092bbb7a1e0b00385012559043c518bd7b20 100644 (file)
--- a/README
+++ b/README
@@ -747,6 +747,15 @@ The following options need to be configured:
                SoC, then define this variable and provide board
                specific code for the "hw_watchdog_reset" function.
 
+               CONFIG_SYS_WATCHDOG_FREQ
+               Some platforms automatically call WATCHDOG_RESET()
+               from the timer interrupt handler every
+               CONFIG_SYS_WATCHDOG_FREQ interrupts. If not set by the
+               board configuration file, a default of CONFIG_SYS_HZ/2
+               (i.e. 500) is used. Setting CONFIG_SYS_WATCHDOG_FREQ
+               to 0 disables calling WATCHDOG_RESET() from the timer
+               interrupt.
+
 - Real-Time Clock:
 
                When CONFIG_CMD_DATE is selected, the type of the RTC

diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c
index cbe29e72a86e94ab8d4c8a5465d0877e4d931a1b..ebb2ac54db56fd62205c2013d7c71e0a0a4e09f3 100644 (file)
--- a/arch/m68k/lib/time.c
+++ b/arch/m68k/lib/time.c
@@ -71,7 +71,7 @@ void dtimer_interrupt(void *not_used)
                timestamp++;
 
                #if defined(CONFIG_WATCHDOG) || defined (CONFIG_HW_WATCHDOG)
-               if ((timestamp % (CONFIG_SYS_WATCHDOG_FREQ)) == 0) {
+               if (CONFIG_SYS_WATCHDOG_FREQ && (timestamp % (CONFIG_SYS_WATCHDOG_FREQ)) == 0) {
                        WATCHDOG_RESET ();
                }
                #endif    /* CONFIG_WATCHDOG || CONFIG_HW_WATCHDOG */

diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c
index 73f270002cfcd015ed64cdd7feeee13579c3b504..5ba4cd0c13ac9d3db432a146a12e2f1bb64fe34c 100644 (file)
--- a/arch/powerpc/lib/interrupts.c
+++ b/arch/powerpc/lib/interrupts.c
@@ -80,7 +80,7 @@ void timer_interrupt(struct pt_regs *regs)
        timestamp++;
 
 #if defined(CONFIG_WATCHDOG) || defined (CONFIG_HW_WATCHDOG)
-       if ((timestamp % (CONFIG_SYS_WATCHDOG_FREQ)) == 0)
+       if (CONFIG_SYS_WATCHDOG_FREQ && (timestamp % (CONFIG_SYS_WATCHDOG_FREQ)) == 0)
                WATCHDOG_RESET ();
 #endif    /* CONFIG_WATCHDOG || CONFIG_HW_WATCHDOG */
 

diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c
index 9adb4b4cabdbd0f0733aa68ef460bda7c4e2794e..952293195f8deaf54641c536f515f11fb7ba9d84 100644 (file)
--- a/drivers/timer/mpc83xx_timer.c
+++ b/drivers/timer/mpc83xx_timer.c
@@ -175,7 +175,7 @@ void timer_interrupt(struct pt_regs *regs)
        priv->timestamp++;
 
 #if defined(CONFIG_WATCHDOG) || defined(CONFIG_HW_WATCHDOG)
-       if ((priv->timestamp % (CONFIG_SYS_WATCHDOG_FREQ)) == 0)
+       if (CONFIG_SYS_WATCHDOG_FREQ && (priv->timestamp % (CONFIG_SYS_WATCHDOG_FREQ)) == 0)
                WATCHDOG_RESET();
 #endif    /* CONFIG_WATCHDOG || CONFIG_HW_WATCHDOG */