Commit a089e4fe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull watchdog updates from Wim Van Sebroeck:

 - a new watchdog driver for the Mellanox systems

 - renesas-wdt: Document r8a77470 support

 - numerous 'Mark expected switch fall-throughs'

 - qcom: Add suspend/resume support

 - some small fixes and documentation updates

* tag 'linux-watchdog-5.1-rc1' of git://www.linux-watchdog.org/linux-watchdog:
  watchdog: w83877f_wdt: Mark expected switch fall-through
  watchdog: sc520_wdt: Mark expected switch fall-through
  watchdog: sbc60xxwdt: Mark expected switch fall-through
  watchdog: smsc37b787_wdt: Mark expected switch fall-through
  watchdog: sc1200: Mark expected switch fall-through
  watchdog: pc87413: Mark expected switch fall-through
  Documentation/watchdog: Add documentation mlx-wdt driver
  watchdog: mlx-wdt: introduce a watchdog driver for Mellanox systems.
  platform_data/mlxreg: additions for Mellanox watchdog driver.
  watchdog: Update sysfs documentation.
  watchdog: dw: remove useless pr_fmt
  watchdog: pika_wdt: drop pointless static qualifier in pikawdt_init
  watchdog/hpwdt: Update Kconfig documentation
  dt-bindings: watchdog: renesas-wdt: Document r8a77470 support
  watchdog: qcom: Add suspend/resume support
parents cf0240a7 458c8961

Documentation/ABI/testing/sysfs-class-watchdog

+23 −0
Original line number Diff line number Diff line
@@ -49,3 +49,26 @@ Contact: Wim Van Sebroeck <wim@iguana.be> 
Description:

		It is a read only file. It is read to know about current

		value of timeout programmed.



What:		/sys/class/watchdog/watchdogn/pretimeout

Date:		December 2016

Contact:	Wim Van Sebroeck <wim@iguana.be>

Description:

		It is a read only file. It specifies the time in seconds before

		timeout when the pretimeout interrupt is delivered.  Pretimeout

		is an optional feature.



What:		/sys/class/watchdog/watchdogn/pretimeout_avaialable_governors

Date:		February 2017

Contact:	Wim Van Sebroeck <wim@iguana.be>

Description:

		It is a read only file. It shows the pretimeout governors

		available for this watchdog.



What:		/sys/class/watchdog/watchdogn/pretimeout_governor

Date:		February 2017

Contact:	Wim Van Sebroeck <wim@iguana.be>

Description:

		It is a read/write file. When read, the currently assigned

		pretimeout governor is returned.  When written, it sets

		the pretimeout governor.

Documentation/devicetree/bindings/watchdog/renesas-wdt.txt

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Required properties: 
		 - "renesas,r8a7743-wdt" (RZ/G1M)

		 - "renesas,r8a7744-wdt" (RZ/G1N)

		 - "renesas,r8a7745-wdt" (RZ/G1E)

		 - "renesas,r8a77470-wdt" (RZ/G1C)

		 - "renesas,r8a774a1-wdt" (RZ/G2M)

		 - "renesas,r8a774c0-wdt" (RZ/G2E)

	         - "renesas,r8a7790-wdt" (R-Car H2)

Documentation/watchdog/mlx-wdt.txt

0 → 100644
+52 −0
Original line number Diff line number Diff line 
		Mellanox watchdog drivers

		for x86 based system switches



This driver provides watchdog functionality for various Mellanox

Ethernet and Infiniband switch systems.



Mellanox watchdog device is implemented in a programmable logic device.



There are 2 types of HW watchdog implementations.



Type 1:

Actual HW timeout can be defined as a power of 2 msec.

e.g. timeout 20 sec will be rounded up to 32768 msec.

The maximum timeout period is 32 sec (32768 msec.),

Get time-left isn't supported



Type 2:

Actual HW timeout is defined in sec. and it's the same as

a user-defined timeout.

Maximum timeout is 255 sec.

Get time-left is supported.



Type 1 HW watchdog implementation exist in old systems and

all new systems have type 2 HW watchdog.

Two types of HW implementation have also different register map.



Mellanox system can have 2 watchdogs: main and auxiliary.

Main and auxiliary watchdog devices can be enabled together

on the same system.

There are several actions that can be defined in the watchdog:

system reset, start fans on full speed and increase register counter.

The last 2 actions are performed without a system reset.

Actions without reset are provided for auxiliary watchdog device,

which is optional.

Watchdog can be started during a probe, in this case it will be

pinged by watchdog core before watchdog device will be opened by

user space application.

Watchdog can be initialised in nowayout way, i.e. oncse started

it can't be stopped.



This mlx-wdt driver supports both HW watchdog implementations.



Watchdog driver is probed from the common mlx_platform driver.

Mlx_platform driver provides an appropriate set of registers for

Mellanox watchdog device, identity name (mlx-wdt-main or mlx-wdt-aux),

initial timeout, performed action in expiration and configuration flags.

watchdog configuration flags: nowayout and start_at_boot, hw watchdog

version - type1 or type2.

The driver checks during initialization if the previous system reset

was done by the watchdog. If yes, it makes a notification about this event.



Access to HW registers is performed through a generic regmap interface.

drivers/watchdog/Kconfig

+21 −4
Original line number Diff line number Diff line
@@ -241,6 +241,22 @@ config RAVE_SP_WATCHDOG 
	help

	  Support for the watchdog on RAVE SP device.



config MLX_WDT

	tristate "Mellanox Watchdog"

	depends on MELLANOX_PLATFORM

	select WATCHDOG_CORE

	select REGMAP

	help

	  This is the driver for the hardware watchdog on Mellanox systems.

	  If you are going to use it, say Y here, otherwise N.

	  This driver can be used together with the watchdog daemon.

	  It can also watch your kernel to make sure it doesn't freeze,

	  and if it does, it reboots your system after a certain amount of

	  time.



	  To compile this driver as a module, choose M here: the

	  module will be called mlx-wdt.



# ALPHA Architecture



# ARM Architecture
@@ -1157,7 +1173,7 @@ config HP_WATCHDOG 
	select WATCHDOG_CORE

	depends on X86 && PCI

	help

	  A software monitoring watchdog and NMI sourcing driver. This driver

	  A software monitoring watchdog and NMI handling driver. This driver

	  will detect lockups and provide a stack trace. This is a driver that

	  will only load on an HP ProLiant system with a minimum of iLO2 support.

	  To compile this driver as a module, choose M here: the module will be
@@ -1175,12 +1191,13 @@ config KEMPLD_WDT 
	  called kempld_wdt.



config HPWDT_NMI_DECODING

	bool "NMI decoding support for the HP ProLiant iLO2+ Hardware Watchdog Timer"

	bool "NMI support for the HP ProLiant iLO2+ Hardware Watchdog Timer"

	depends on HP_WATCHDOG

	default y

	help

	  When an NMI occurs this feature will make the necessary BIOS calls to

	  log the cause of the NMI.

	  Enables the NMI handler for the watchdog pretimeout NMI and the iLO

	  "Generate NMI to System" virtual button.  When an NMI is claimed

	  by the driver, panic is called.



config SC1200_WDT

	tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"

drivers/watchdog/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ obj-$(CONFIG_INTEL_MID_WATCHDOG) += intel-mid_wdt.o 
obj-$(CONFIG_INTEL_MEI_WDT) += mei_wdt.o

obj-$(CONFIG_NI903X_WDT) += ni903x_wdt.o

obj-$(CONFIG_NIC7018_WDT) += nic7018_wdt.o

obj-$(CONFIG_MLX_WDT) += mlx_wdt.o



# M68K Architecture

obj-$(CONFIG_M54xx_WATCHDOG) += m54xx_wdt.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE