linux-stable.git/drivers/watchdog, branch v5.8

treewide: replace '---help---' in Kconfig files with 'help'

2020-06-13T16:57:21+00:00

Since commit 84af7a6194e4 ("checkpatch: kconfig: prefer 'help' over
'---help---'"), the number of '---help---' has been gradually
decreasing, but there are still more than 2400 instances.

This commit finishes the conversion. While I touched the lines,
I also fixed the indentation.

There are a variety of indentation styles found.

  a) 4 spaces + '---help---'
  b) 7 spaces + '---help---'
  c) 8 spaces + '---help---'
  d) 1 space + 1 tab + '---help---'
  e) 1 tab + '---help---'    (correct indentation)
  f) 1 tab + 1 space + '---help---'
  g) 1 tab + 2 spaces + '---help---'

In order to convert all of them to 1 tab + 'help', I ran the
following commend:

  $ find . -name 'Kconfig*' | xargs sed -i 's/^[[:space:]]*---help---/\thelp/'

Signed-off-by: Masahiro Yamada

Merge tag 'linux-watchdog-5.8-rc1' of git://www.linux-watchdog.org/linux-watchdog

2020-06-04T17:50:22+00:00

Pull watchdog updates from Wim Van Sebroeck:

 - add new arm_smc_wdt watchdog driver

 - da9062 and da9063 improvements

 - clarify documentation about stop() that became optional

 - document r8a7742 support

 - some overall fixes and improvements

* tag 'linux-watchdog-5.8-rc1' of git://www.linux-watchdog.org/linux-watchdog:
  watchdog: m54xx: Add missing include
  dt-bindings: watchdog: renesas,wdt: Document r8a7742 support
  watchdog: Fix runtime PM imbalance on error
  watchdog: riowd: remove unneeded semicolon
  watchdog: Add new arm_smc_wdt watchdog driver
  dt-bindings: watchdog: Add ARM smc wdt for mt8173 watchdog
  watchdog: imx2_wdt: update contact email
  watchdog: iTCO: fix link error
  watchdog: da9062: No need to ping manually before setting timeout
  watchdog: da9063: Make use of pre-configured timeout during probe
  watchdog: da9062: Initialize timeout during probe
  watchdog: clarify that stop() is optional
  watchdog: imx_sc_wdt: Fix reboot on crash
  watchdog: ts72xx_wdt: fix build error

watchdog: m54xx: Add missing include

2020-05-25T06:55:47+00:00

A recent cleanup removed the mm.h include from uaccess_no.h in
m68k. This breaks the build of the m54xx watchdog driver:

  drivers/watchdog/m54xx_wdt.c:49:9: error: implicit declaration of function '__raw_readl'

Due to magic include chains the inclusion of mm.h in uaccess_no.h pulled in io.h.

Include 'linux/io.h' explicitely to fix this.

Fixes: 9e860351550b ("m68knommu: Remove mm.h include from uaccess_no.h")
Reported-by: kbuild test robot 
Signed-off-by: Thomas Gleixner 
Cc: Wim Van Sebroeck 
Cc: Guenter Roeck 
Cc: linux-watchdog@vger.kernel.org
Reviewed-by: Guenter Roeck 
Link: https://lore.kernel.org/r/87blmyjjtf.fsf@nanos.tec.linutronix.de
Signed-off-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: Fix runtime PM imbalance on error

2020-05-25T06:55:46+00:00

When watchdog_register_device() returns an error code,
a pairing runtime PM usage counter decrement is needed
to keep the counter balanced.

Signed-off-by: Dinghao Liu 
Reviewed-by: Guenter Roeck 
Link: https://lore.kernel.org/r/20200521080141.24373-1-dinghao.liu@zju.edu.cn
Signed-off-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: riowd: remove unneeded semicolon

2020-05-25T06:55:46+00:00

Fix the following coccicheck warning:

drivers/watchdog/riowd.c:144:2-3: Unneeded semicolon

Signed-off-by: Jason Yan 
Reviewed-by: Guenter Roeck 
Link: https://lore.kernel.org/r/20200428063333.2743-1-yanaijie@huawei.com
Signed-off-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: Add new arm_smc_wdt watchdog driver

2020-05-25T06:55:46+00:00

This patch adds a watchdog driver that can be used on ARM systems
with the appropriate watchdog implemented in Secure Monitor firmware.
The driver communicates with firmware via a Secure Monitor Call.
This may be useful for platforms using TrustZone that want
the Secure Monitor firmware to have the final control over the watchdog.

This is implemented on mt8173 chromebook devices oak, elm and hana in
arm trusted firmware file plat/mediatek/mt8173/drivers/wdt/wdt.c.

Signed-off-by: Julius Werner 
Signed-off-by: Evan Benn 
Reviewed-by: Julius Werner 
Tested-by: Xingyu Chen
Reviewed-by: Guenter Roeck 
Link: https://lore.kernel.org/r/20200505131242.v6.2.Ia92bb4d4ce84bcefeba1d00aaa1c1e919b6164ef@changeid
Signed-off-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: imx2_wdt: update contact email

2020-05-25T06:55:45+00:00

The 'pengutronix' address is defunct for years. Use the proper contact
address.

Signed-off-by: Wolfram Sang 
Reviewed-by: Guenter Roeck 
Link: https://lore.kernel.org/r/20200502142653.19144-1-wsa@kernel.org
Signed-off-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: iTCO: fix link error

2020-05-25T06:55:45+00:00

When the MFD driver is a loadable module, the watchdog driver fails
to get linked into the kernel:

drivers/watchdog/iTCO_wdt.o: In function `update_no_reboot_bit_pmc':
iTCO_wdt.c:(.text+0x54f): undefined reference to `intel_pmc_gcr_update'

The code is written to support operation without the MFD driver, so
add a Kconfig dependency that allows this, while disallowing the watchdog
to be built-in when the MFD driver is a module.

Fixes: 25f1ca31e230 ("platform/x86: intel_pmc_ipc: Convert to MFD")
Signed-off-by: Arnd Bergmann 
Acked-by: Guenter Roeck 
Reviewed-by: Mika Westerberg 
Link: https://lore.kernel.org/r/20200428212959.2993304-1-arnd@arndb.de
Signed-off-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: da9062: No need to ping manually before setting timeout

2020-05-25T06:55:44+00:00

There is actually no need to ping the watchdog before disabling it
during timeout change. Disabling the watchdog already takes care of
resetting the counter.

This fixes an issue during boot when the userspace watchdog handler takes
over and the watchdog is already running. Opening the watchdog in this case
leads to the first ping and directly after that without the required
heartbeat delay a second ping issued by the set_timeout call. Due to the
missing delay this resulted in a reset.

Signed-off-by: Stefan Riedmueller 
Reviewed-by: Guenter Roeck 
Reviewed-by: Adam Thomson 
Link: https://lore.kernel.org/r/20200403130728.39260-3-s.riedmueller@phytec.de
Signed-off-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: da9063: Make use of pre-configured timeout during probe

2020-05-25T06:55:43+00:00

The watchdog might already be running during boot with a timeout set by
e.g. the bootloader. Make use of this pre-configured timeout instead of
falling back to the default timeout if no device tree value is given.

Signed-off-by: Stefan Riedmueller 
Reviewed-by: Adam Thomson 
Reviewed-by: Guenter Roeck 
Link: https://lore.kernel.org/r/20200403130728.39260-2-s.riedmueller@phytec.de
Signed-off-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck