STM32 WWDG watchdog driver works

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4618 42af7a65-404d-4744-a932-0658087f49c3

5 files changed, 235 insertions, 23 deletions

diff --git a/nuttx/arch/arm/src/stm32/chip/stm32_wdg.h b/nuttx/arch/arm/src/stm32/chip/stm32_wdg.h
index a3ca75205..5abb5bc6d 100644
--- a/nuttx/arch/arm/src/stm32/chip/stm32_wdg.h
+++ b/nuttx/arch/arm/src/stm32/chip/stm32_wdg.h
@@ -110,14 +110,14 @@
 
 #define WWDG_CR_T_SHIFT         (0)       /* Bits 6:0 T[6:0]: 7-bit counter (MSB to LSB) */
 #define WWDG_CR_T_MASK          (0x7f << WWDG_CR_T_SHIFT)
+#  define WWDG_CR_T_MAX         (0x3f << WWDG_CR_T_SHIFT)
+#  define WWDG_CR_T_RESET       (0x40 << WWDG_CR_T_SHIFT)
 #define WWDG_CR_WDGA            (1 << 7)  /* Bit 7: Activation bit */
 
 /* Configuration register (32-bit) */
 
 #define WWDG_CFR_W_SHIFT        (0)       /* Bits 6:0 W[6:0] 7-bit window value */
 #define WWDG_CFR_W_MASK         (0x7f << WWDG_CFR_W_SHIFT)
-#  define WWDG_CFR_W_MAX        (0x3f << WWDG_CFR_W_SHIFT)
-#  define WWDG_CFR_W_RESET      (0x40 << WWDG_CFR_W_SHIFT)
 #define WWDG_CFR_WDGTB_SHIFT    (7)       /* Bits 8:7 [1:0]: Timer Base */
 #define WWDG_CFR_WDGTB_MASK     (3 << WWDG_CFR_WDGTB_SHIFT)
 #  define WWDG_CFR_PCLK1        (0 << WWDG_CFR_WDGTB_SHIFT) /* 00: CK Counter Clock (PCLK1 div 4096) div 1 */
diff --git a/nuttx/arch/arm/src/stm32/stm32_iwdg.c b/nuttx/arch/arm/src/stm32/stm32_iwdg.c
index ca9796389..e2d08cfec 100644
--- a/nuttx/arch/arm/src/stm32/stm32_iwdg.c
+++ b/nuttx/arch/arm/src/stm32/stm32_iwdg.c
@@ -61,6 +61,20 @@
 #  define CONFIG_STM32_IWDG_DEFTIMOUT 3000 /* Three seconds */
 #endif
 
+/* Debug ********************************************************************/
+/* Non-standard debug that may be enabled just for testing the watchdog
+ * driver.  NOTE: that only lldbg types are used so that the output is
+ * immediately available.
+ */
+
+#ifdef CONFIG_DEBUG_WATCHDOG
+#  define wddbg    lldbg
+#  define wdvdbg   llvdbg
+#else
+#  define wddbg(x...)
+#  define wdvdbg(x...)
+#endif
+
 /****************************************************************************
  * Private Types
  ****************************************************************************/
diff --git a/nuttx/arch/arm/src/stm32/stm32_wwdg.c b/nuttx/arch/arm/src/stm32/stm32_wwdg.c
index 7db40b228..3272d569a 100644
--- a/nuttx/arch/arm/src/stm32/stm32_wwdg.c
+++ b/nuttx/arch/arm/src/stm32/stm32_wwdg.c
@@ -42,6 +42,7 @@
 
 #include <stdint.h>
 #include <errno.h>
+#include <debug.h>
 
 #include <nuttx/watchdog.h>
 #include <arch/board/board.h>
@@ -55,12 +56,43 @@
 /****************************************************************************
  * Pre-Processor Definitions
  ****************************************************************************/
+/* Clocking *****************************************************************/
+/* The minimum frequency of the WWD clock is:
+ *
+ *  Fmin = PCLK1 / 4096 / 8
+ *
+ * So the maximum delay (in milliseconds) is then:
+ *
+ *   1000 * (WWDG_CR_T_MAX+1) / Fmin
+ *
+ * For example, if PCLK1 = 42MHz, then the maximum delay is:
+ *
+ *   Fmin = 1281.74
+ *   1000 * 64 / Fmin = 49.93 msec
+ */
+
+#define WWDG_FMIN       (STM32_PCLK1_FREQUENCY / 4096 / 8)
+#define WWDG_MAXTIMEOUT (1000 * (WWDG_CR_T_MAX+1) / WWDG_FMIN)
+
 /* Configuration ************************************************************/
 
 #ifndef CONFIG_STM32_WWDG_DEFTIMOUT
-#  define CONFIG_STM32_WWDG_DEFTIMOUT 3000 /* Three seconds */
+#  define CONFIG_STM32_WWDG_DEFTIMOUT WWDG_MAXTIMEOUT
 #endif
 
+/* Debug ********************************************************************/
+/* Non-standard debug that may be enabled just for testing the watchdog
+ * driver.  NOTE: that only lldbg types are used so that the output is
+ * immediately available.
+ */
+
+#ifdef CONFIG_DEBUG_WATCHDOG
+#  define wddbg    lldbg
+#  define wdvdbg   llvdbg
+#else
+#  define wddbg(x...)
+#  define wdvdbg(x...)
+#endif
 
 /****************************************************************************
  * Private Types
@@ -147,10 +179,10 @@ static struct stm32_lowerhalf_s g_wdgdev;
  ****************************************************************************/
 
 #if defined(CONFIG_STM32_WWDG_REGDEBUG) && defined(CONFIG_DEBUG)
-static uint16_t stm32_getreg(uint16_t addr)
+static uint16_t stm32_getreg(uint32_t addr)
 {
-  static uint16_t prevaddr = 0;
-  static uint16_t count = 0;
+  static uint32_t prevaddr = 0;
+  static uint32_t count = 0;
   static uint16_t preval = 0;
 
   /* Read the value from the register */
@@ -314,14 +346,15 @@ static int stm32_start(FAR struct watchdog_lowerhalf_s *lower)
 {
   FAR struct stm32_lowerhalf_s *priv = (FAR struct stm32_lowerhalf_s *)lower;
 
+  wdvdbg("Entry\n");
+  DEBUGASSERT(priv);
+
   /* The watchdog is always disabled after a reset. It is enabled by setting
    * the WDGA bit in the WWDG_CR register, then it cannot be disabled again
    * except by a reset.
    */
 
-  DEBUGASSERT(priv);
-
-  stm32_putreg(WWDG_CR_WDGA | WWDG_CFR_W_RESET | priv->reload, STM32_WWDG_CR);
+  stm32_putreg(WWDG_CR_WDGA | WWDG_CR_T_RESET | priv->reload, STM32_WWDG_CR);
   priv->started = true;
   return OK;
 }
@@ -348,6 +381,7 @@ static int stm32_stop(FAR struct watchdog_lowerhalf_s *lower)
    * except by a reset.
    */
 
+  wdvdbg("Entry\n");
   return -ENOSYS;
 }
 
@@ -378,13 +412,14 @@ static int stm32_keepalive(FAR struct watchdog_lowerhalf_s *lower)
 {
   FAR struct stm32_lowerhalf_s *priv = (FAR struct stm32_lowerhalf_s *)lower;
 
+  wdvdbg("Entry\n");
   DEBUGASSERT(priv);
 
   /* Write to T[6:0] bits to configure the counter value, no need to do
    * a read-modify-write; writing a 0 to WDGA bit does nothing.
    */
 
-  stm32_putreg((WWDG_CFR_W_RESET | priv->reload), STM32_WWDG_CR);
+  stm32_putreg((WWDG_CR_T_RESET | priv->reload), STM32_WWDG_CR);
   return OK;
 }
 
@@ -411,6 +446,7 @@ static int stm32_getstatus(FAR struct watchdog_lowerhalf_s *lower,
   uint32_t elapsed;
   uint16_t reload;
 
+  wdvdbg("Entry\n");
   DEBUGASSERT(priv);
 
   /* Return the status bit */
@@ -436,6 +472,10 @@ static int stm32_getstatus(FAR struct watchdog_lowerhalf_s *lower,
   elapsed = priv->reload - reload;
   status->timeleft = (priv->timeout * elapsed) / (priv->reload + 1);
 
+  wdvdbg("Status     :\n");
+  wdvdbg("  flags    : %08x\n", status->flags);
+  wdvdbg("  timeout  : %d\n", status->timeout);
+  wdvdbg("  timeleft : %d\n", status->flags);
   return OK;
 }
 
@@ -459,20 +499,30 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower,
                             uint32_t timeout)
 {
   FAR struct stm32_lowerhalf_s *priv = (FAR struct stm32_lowerhalf_s *)lower;
-
-  DEBUGASSERT(priv);
   uint32_t fwwdg;
   uint32_t reload;
   uint16_t regval;
   int wdgtb;
 
-   /* Determine prescaler value.
+  DEBUGASSERT(priv);
+  wdvdbg("Entry: timeout=%d\n", timeout);
+
+  /* Can this timeout be represented? */
+
+  if (timeout < 1 || timeout > WWDG_MAXTIMEOUT)
+    {
+      wddbg("Cannot represent timeout=%d > %d\n",
+            timeout, WWDG_MAXTIMEOUT);
+      return -ERANGE;
+    }
+
+  /* Determine prescaler value.
    *
    * Fwwdg = PCLK1/4096/prescaler.
    *
    * Where
    *  Fwwwdg is the frequency of the WWDG clock
-   *  prescaler is one of {1, 2, 4, or 8}
+   *  wdgtb is one of {1, 2, 4, or 8}
    */
 
   /* Select the smallest prescaler that will result in a reload field value that is
@@ -509,7 +559,11 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower,
        * settings.
        */
 
-      if (reload <= WWDG_CFR_W_MAX || wdgtb == 3)
+#if 0
+      wdvdbg("wdgtb=%d fwwdg=%d reload=%d timout=%d\n",
+             wdgtb, fwwdg, reload,  1000 * (reload + 1) / fwwdg);
+#endif
+      if (reload <= WWDG_CR_T_MAX || wdgtb == 3)
         {
           /* Note that we explicity break out of the loop rather than using
            * the 'for' loop termination logic because we do not want the
@@ -522,9 +576,9 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower,
 
   /* Make sure that the final reload value is within range */
 
-  if (reload > WWDG_CFR_W_MAX)
+  if (reload > WWDG_CR_T_MAX)
     {
-      reload = WWDG_CFR_W_MAX;
+      reload = WWDG_CR_T_MAX;
     }
 
   /* Calculate and save the actual timeout value in milliseconds:
@@ -538,11 +592,14 @@ static int stm32_settimeout(FAR struct watchdog_lowerhalf_s *lower,
 
   priv->fwwdg  = fwwdg;
   priv->reload = reload;
+
+  wdvdbg("wdgtb=%d fwwdg=%d reload=%d timout=%d\n",
+         wdgtb, fwwdg, reload, priv->timeout);
   
   /* Set WDGTB[1:0] bits according to calculated value */
 
   regval = stm32_getreg(STM32_WWDG_CFR);
-  regval &= WWDG_CFR_WDGTB_MASK;
+  regval &= ~WWDG_CFR_WDGTB_MASK;
   regval |= (uint16_t)wdgtb << WWDG_CFR_WDGTB_SHIFT;
   stm32_putreg(regval, STM32_WWDG_CFR);
 
@@ -585,6 +642,7 @@ static xcpt_t stm32_capture(FAR struct watchdog_lowerhalf_s *lower,
   uint16_t regval;
 
   DEBUGASSERT(priv);
+  wdvdbg("Entry: handler=%p\n", handler);
 
   /* Get the old handler return value */
 
@@ -648,6 +706,7 @@ static int stm32_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd,
   int ret = -ENOTTY;
 
   DEBUGASSERT(priv);
+  wdvdbg("Entry: cmd=%d arg=%ld\n", cmd, arg);
 
   /* WDIOC_MINTIME: Set the minimum ping time.  If two keepalive ioctls
    * are received within this time, a reset event will be generated.
@@ -658,14 +717,16 @@ static int stm32_ioctl(FAR struct watchdog_lowerhalf_s *lower, int cmd,
     {
       uint32_t mintime = (uint32_t)arg;
  
-      /* The minimum time should be strictly less than the total delay */
+      /* The minimum time should be strictly less than the total delay
+       * which, in turn, will be less than or equal to WWDG_CR_T_MAX
+       */
 
       ret = -EINVAL;
       if (mintime < priv->timeout)
         {
           uint32_t window = (priv->timeout - mintime) * priv->fwwdg / 1000 - 1;
           DEBUGASSERT(window < priv->reload);
-          stm32_setwindow(priv, window | WWDG_CFR_W_RESET);
+          stm32_setwindow(priv, window | WWDG_CR_T_RESET);
           ret = OK;
         }
     }
@@ -698,6 +759,8 @@ void stm32_wwdginitialize(FAR const char *devpath)
 {
   FAR struct stm32_lowerhalf_s *priv = &g_wdgdev;
 
+  wdvdbg("Entry: devpath=%s\n", devpath);
+
   /* NOTE we assume that clocking to the IWDG has already been provided by
    * the RCC initialization logic.
    */
diff --git a/nuttx/configs/stm3240g-eval/src/up_watchdog.c b/nuttx/configs/stm3240g-eval/src/up_watchdog.c
new file mode 100644
index 000000000..db4a54a9f
--- /dev/null
+++ b/nuttx/configs/stm3240g-eval/src/up_watchdog.c
@@ -0,0 +1,136 @@
+/************************************************************************************
+ * configs/stm3240g-eval/src/up_watchdog.c
+ * arch/arm/src/board/up_watchdog.c
+ *
+ *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ************************************************************************************/
+
+/************************************************************************************
+ * Included Files
+ ************************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <errno.h>
+#include <debug.h>
+
+#include <nuttx/watchdog.h>
+#include <arch/board/board.h>
+
+#include "stm32_wdg.h"
+
+#ifdef CONFIG_WATCHDOG
+
+/************************************************************************************
+ * Definitions
+ ************************************************************************************/
+/* Configuration *******************************************************************/
+/* Wathdog hardware should be enabled */
+
+#if !defined(CONFIG_STM32_WWDG) && !defined(CONFIG_STM32_IWDG)
+#  warning "One of CONFIG_STM32_WWDG or CONFIG_STM32_IWDG must be defined"
+#endif
+
+/* Select the path to the registered watchdog timer device */
+
+#ifndef CONFIG_STM32_WDG_DEVPATH
+#  ifdef CONFIG_EXAMPLES_WATCHDOG_DEVPATH
+#    define CONFIG_STM32_WDG_DEVPATH CONFIG_EXAMPLES_WATCHDOG_DEVPATH
+#  else
+#    define CONFIG_STM32_WDG_DEVPATH "/dev/watchdog0"
+#  endif
+#endif
+
+/* Use the un-calibrated LSI frequency if we have nothing better */
+
+#if defined(CONFIG_STM32_IWDG) && !defined(CONFIG_STM32_LSIFREQ)
+#  define CONFIG_STM32_LSIFREQ STM32_LSI_FREQUENCY
+#endif
+
+/* Debug ***************************************************************************/
+/* Non-standard debug that may be enabled just for testing the watchdog timer */
+
+#ifndef CONFIG_DEBUG
+#  undef CONFIG_DEBUG_WATCHDOG
+#endif
+
+#ifdef CONFIG_DEBUG_WATCHDOG
+#  define wdgdbg                 dbg
+#  define wdglldbg               lldbg
+#  ifdef CONFIG_DEBUG_VERBOSE
+#    define wdgvdbg              vdbg
+#    define wdgllvdbg            llvdbg
+#  else
+#    define wdgvdbg(x...)
+#    define wdgllvdbg(x...)
+#  endif
+#else
+#  define wdgdbg(x...)
+#  define wdglldbg(x...)
+#  define wdgvdbg(x...)
+#  define wdgllvdbg(x...)
+#endif
+
+/************************************************************************************
+ * Private Functions
+ ************************************************************************************/
+
+/************************************************************************************
+ * Public Functions
+ ************************************************************************************/
+
+/****************************************************************************
+ * Name: up_wdginitialize()
+ *
+ * Description:
+ *   Perform architecuture-specific initialization of the Watchdog hardware.
+ *   This interface must be provided by all configurations using
+ *   apps/examples/watchdog
+ *
+ ****************************************************************************/
+
+int up_wdginitialize(void)
+{
+  /* Initialize tha register the watchdog timer device */
+
+#if defined(CONFIG_STM32_WWDG)
+  stm32_wwdginitialize(CONFIG_STM32_WDG_DEVPATH);
+  return OK;
+#elif defined(CONFIG_STM32_IWDG)
+  stm32_iwdginitialize(CONFIG_STM32_WDG_DEVPATH, CONFIG_STM32_LSIFREQ);
+  return OK;
+#else
+  return -ENODEV;
+#endif
+}
+
+#endif /* CONFIG_WATCHDOG */
diff --git a/nuttx/drivers/watchdog.c b/nuttx/drivers/watchdog.c
index d7ee30365..4f7357444 100644
--- a/nuttx/drivers/watchdog.c
+++ b/nuttx/drivers/watchdog.c
@@ -60,7 +60,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 /* Debug ********************************************************************/
-/* Non-standard debug that may be enabled just for testing PWM */
+/* Non-standard debug that may be enabled just for testing the watchdog driver */
 
 #ifdef CONFIG_DEBUG_WATCHDOG
 #  define wddbg    dbg
@@ -478,7 +478,7 @@ FAR void *watchdog_register(FAR const char *path,
   int ret;
 
   DEBUGASSERT(path && lower);
-  wdvdbg("Registering: %s\n", path);
+  wdvdbg("Entry: path=%s\n", path);
 
   /* Allocate the upper-half data structure */
 
@@ -508,7 +508,6 @@ FAR void *watchdog_register(FAR const char *path,
 
   /* Register the watchdog timer device */
 
-  wdvdbg("Registering %s\n", path);
   ret = register_driver(path, &g_wdogops, 0666, upper);
   if (ret < 0)
     {