linux-stable.git/drivers/watchdog, branch v4.0.2

watchdog: imgpdc: Fix default heartbeat

2015-03-27T07:47:50+00:00

The IMG PDC watchdog driver heartbeat module parameter has no default so
it is initialised to zero. This results in the following warning during
probe:

imgpdc-wdt 2006000.wdt: Initial timeout out of range! setting max timeout

The module parameter description implies that the default value should
be PDC_WDT_DEF_TIMEOUT, which isn't yet used, so initialise it to that.

Also tweak the heartbeat module parameter description for consistency.

Fixes: 93937669e9b5 ("watchdog: ImgTec PDC Watchdog Timer Driver")
Signed-off-by: James Hogan 
Cc: Ezequiel Garcia 
Cc: Naidu Tellapati 
Cc: Jude Abraham 
Cc: linux-watchdog@vger.kernel.org
Reviewed-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: imgpdc: Fix probe NULL pointer dereference

2015-03-27T07:47:42+00:00

The IMG PDC watchdog probe function calls pdc_wdt_stop() prior to
watchdog_set_drvdata(), causing a NULL pointer dereference when
pdc_wdt_stop() retrieves the struct pdc_wdt_dev pointer using
watchdog_get_drvdata() and reads the register base address through it.

Fix by moving the watchdog_set_drvdata() call earlier, to where various
other pdc_wdt->wdt_dev fields are initialised.

Fixes: 93937669e9b5 ("watchdog: ImgTec PDC Watchdog Timer Driver")
Signed-off-by: James Hogan 
Cc: Ezequiel Garcia 
Cc: Naidu Tellapati 
Cc: Jude Abraham 
Cc: linux-watchdog@vger.kernel.org
Reviewed-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: mtk_wdt: signedness bug in mtk_wdt_start()

2015-03-27T07:47:36+00:00

"ret" should be signed for the error handling to work correctly.  This
doesn't matter much in real life since mtk_wdt_set_timeout() always
succeeds.

Signed-off-by: Dan Carpenter 
Reviewed-by: Matthias Brugger 
Reviewed-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: at91sam9: request the irq with IRQF_NO_SUSPEND

2015-03-05T23:46:31+00:00

The watchdog interrupt (only used when activating software watchdog)
shouldn't be suspended when entering suspend mode, because it is shared
with a timer device (which request the line with IRQF_NO_SUSPEND) and once
the watchdog "Mode Register" has been written, it cannot be changed (which
means we cannot disable the watchdog interrupt when entering suspend).

Signed-off-by: Boris Brezillon 
Reviewed-by: Alexandre Belloni 
Acked-by: Guenter Roeck 
Acked-by: Nicolas Ferre 
Signed-off-by: Rafael J. Wysocki

watchdog: bcm47xx_wdt.c: allow enabling on BCM5301X arch

2015-02-17T20:34:13+00:00

BCM5301X (ARCH_BCM_5301X) is a new Broadcom architecture using the same
SoC bus driver (bcma) as BCM47XX but based on ARM instead of MIPS.

Signed-off-by: Rafał Miłecki 
Reviewed-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: jz4740: Add DT support

2015-02-17T20:34:09+00:00

Add DT support to the jz4740 driver. Simple of_match_ptr. No other
modification for probe needed

Signed-off-by: Zubair Lutfullah Kakakhel 
Reviewed-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: dw_wdt: Try to get a 30 second watchdog by default

2015-02-17T20:33:49+00:00

The dw_wdt_set_top() function takes in a value in seconds.  In
dw_wdt_open() we were calling it with a value that's supposed to
represent the maximum value programmed into the "top" register with a
comment saying that we were trying to set the watchdog to its maximum
value.  Instead we ended up setting the watchdog to ~15 seconds.

Let's fix this.  However, setting things to the "max" gives me an 86
second watchdog in the system I'm looking at.  86 seconds feels a
little too long.  We'll explicitly choose 30 seconds as a more
reasonable value.

NOTE: Ideally this driver should be transitioned to be a real watchdog
driver.  Then we could use "watchdog_init_timeout" and let the timeout
be specified in a number of ways (device tree, module parameter, etc).
This patch should be considered a bit of a stopgap solution.

Signed-off-by: Doug Anderson 
Reviewed-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: dw_wdt: pat the watchdog before enabling it

2015-02-17T20:33:43+00:00

On some dw_wdt implementations the "top" register may be initted to 0
at bootup.  In such a case, each "pat" of the watchdog will reset the
timer to 0xffff.  That's pretty short.

The input clock of the wdt can be any of a wide range of values.  On
an rk3288 system, I've seen the wdt clock be 24.75 MHz.  That means
each tick is ~40ns and we'll count to 0xffff in ~2.6ms.

Because of the above two facts, it's a really good idea to pat the
watchdog after initting the "top" register properly and before
enabling the watchdog.  If you don't then there's no way we'll get the
next heartbeat in time.

Jisheng Zhang fixed this problem on some dw_wdt versions by using the
TOP_INIT feature.  However, the dw_wdt on rk3288 doesn't have TOP_INIT
so it's a good idea to also pat the watchdog manually.

Signed-off-by: Doug Anderson 
Reviewed-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: w83627hf_wdt: Add support for NCT6791 and NCT6792

2015-02-17T20:33:37+00:00

The watchdog functionality in both chips is almost identical to NCT6779.

Signed-off-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: bcm47xx_wdt.c: add restart handler support

2015-02-17T20:33:27+00:00

Just like in case of other watchdog drivers, use the new kernel core
API to provide restart support.

Signed-off-by: Rafał Miłecki 
Reviewed-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck