lkml.org 
[lkml]   [2014]   [Jul]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.14 19/59] watchdog: ath79_wdt: avoid spurious restarts on AR934x
    Date
    3.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Gabor Juhos <juhosg@openwrt.org>

    commit 23afeb613ec0e10aecfae7838a14d485db62ac52 upstream.

    On some AR934x based systems, where the frequency of
    the AHB bus is relatively high, the built-in watchdog
    causes a spurious restart when it gets enabled.

    The possible cause of these restarts is that the timeout
    value written into the TIMER register does not reaches
    the hardware in time.

    Add an explicit delay into the ath79_wdt_enable function
    to avoid the spurious restarts.

    Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
    Reviewed-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/watchdog/ath79_wdt.c | 10 ++++++++++
    1 file changed, 10 insertions(+)

    --- a/drivers/watchdog/ath79_wdt.c
    +++ b/drivers/watchdog/ath79_wdt.c
    @@ -20,6 +20,7 @@
    #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

    #include <linux/bitops.h>
    +#include <linux/delay.h>
    #include <linux/errno.h>
    #include <linux/fs.h>
    #include <linux/init.h>
    @@ -91,6 +92,15 @@ static inline void ath79_wdt_keepalive(v
    static inline void ath79_wdt_enable(void)
    {
    ath79_wdt_keepalive();
    +
    + /*
    + * Updating the TIMER register requires a few microseconds
    + * on the AR934x SoCs at least. Use a small delay to ensure
    + * that the TIMER register is updated within the hardware
    + * before enabling the watchdog.
    + */
    + udelay(2);
    +
    ath79_wdt_wr(WDOG_REG_CTRL, WDOG_CTRL_ACTION_FCR);
    /* flush write */
    ath79_wdt_rr(WDOG_REG_CTRL);



    \
     
     \ /
      Last update: 2014-07-05 00:41    [W:2.126 / U:0.392 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site