Commit 29057cc5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull watchdog updates from Wim Van Sebroeck:

 - add marvell GTI watchdog driver

 - add support for Amlogic-T7 SoCs

 - document the IPQ5018 watchdog compatible

 - enable COMPILE_TEST for more watchdog device drivers

 - core: stop watchdog when executing poweroff command

 - other small improvements and fixes

* tag 'linux-watchdog-6.6-rc1' of git://www.linux-watchdog.org/linux-watchdog: (21 commits)
  watchdog: Add support for Amlogic-T7 SoCs
  watchdog: Add a new struct for Amlogic-GXBB driver
  dt-bindings: watchdog: Add support for Amlogic-T7 SoCs
  dt-bindings: watchdog: qcom-wdt: document IPQ5018
  watchdog: imx2_wdt: Improve dev_crit() message
  watchdog: stm32: Drop unnecessary of_match_ptr()
  watchdog: sama5d4: readout initial state
  watchdog: intel-mid_wdt: add MODULE_ALIAS() to allow auto-load
  watchdog: core: stop watchdog when executing poweroff command
  watchdog: pm8916_wdt: Remove redundant of_match_ptr()
  watchdog: xilinx_wwdt: Use div_u64() in xilinx_wwdt_start()
  watchdog: starfive: Remove #ifdef guards for PM related functions
  watchdog: s3c2410: Fix potential deadlock on &wdt->lock
  watchdog:rit_wdt: Add support for WDIOF_CARDRESET
  dt-bindings: watchdog: ti,rti-wdt: Add support for WDIOF_CARDRESET
  watchdog: Enable COMPILE_TEST for more drivers
  watchdog: advantech_ec_wdt: fix Kconfig dependencies
  watchdog: Explicitly include correct DT includes
  Watchdog: Add marvell GTI watchdog driver
  dt-bindings: watchdog: marvell GTI system watchdog driver
  ...
parents 57ac7ff8 8c776a04

Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ properties: 
  compatible:

    enum:

      - amlogic,meson-gxbb-wdt

      - amlogic,t7-wdt



  reg:

    maxItems: 1

Documentation/devicetree/bindings/watchdog/marvell,cn10624-wdt.yaml

0 → 100644
+83 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/watchdog/marvell,cn10624-wdt.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Marvell Global Timer (GTI) system watchdog



maintainers:

  - Bharat Bhushan <bbhushan2@marvell.com>



allOf:

  - $ref: watchdog.yaml#



properties:

  compatible:

    oneOf:

      - enum:

          - marvell,cn9670-wdt

          - marvell,cn10624-wdt



      - items:

          - enum:

              - marvell,cn9880-wdt

              - marvell,cnf9535-wdt

          - const: marvell,cn9670-wdt



      - items:

          - enum:

              - marvell,cn10308-wdt

              - marvell,cnf10518-wdt

          - const: marvell,cn10624-wdt



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1



  clock-names:

    items:

      - const: refclk



  marvell,wdt-timer-index:

    $ref: /schemas/types.yaml#/definitions/uint32

    minimum: 0

    maximum: 63

    description:

      An SoC have many timers (up to 64), firmware can reserve one or more timer

      for some other use case and configures one of the global timer as watchdog

      timer. Firmware will update this field with the timer number configured

      as watchdog timer.



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    soc {

        #address-cells = <2>;

        #size-cells = <2>;



        watchdog@802000040000 {

            compatible = "marvell,cn9670-wdt";

            reg = <0x00008020 0x00040000 0x00000000 0x00020000>;

            interrupts = <GIC_SPI 38 IRQ_TYPE_EDGE_RISING>;

            clocks = <&sclk>;

            clock-names = "refclk";

            marvell,wdt-timer-index = <63>;

        };

    };



...

Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ properties: 
      - items:

          - enum:

              - qcom,kpss-wdt-ipq4019

              - qcom,apss-wdt-ipq5018

              - qcom,apss-wdt-ipq5332

              - qcom,apss-wdt-ipq9574

              - qcom,apss-wdt-msm8994

Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml

+27 −1
Original line number Diff line number Diff line
@@ -34,6 +34,20 @@ properties: 
  power-domains:

    maxItems: 1



  memory-region:

    maxItems: 1

    description:

      Contains the watchdog reserved memory. It is optional.

      In the reserved memory, the specified values, which are

      PON_REASON_SOF_NUM(0xBBBBCCCC), PON_REASON_MAGIC_NUM(0xDDDDDDDD),

      and PON_REASON_EOF_NUM(0xCCCCBBBB), are pre-stored at the first

      3 * 4 bytes to tell that last boot was caused by watchdog reset.

      Once the PON reason is captured by driver(rti_wdt.c), the driver

      is supposed to wipe the whole memory region. Surely, if this

      property is set, at least 12 bytes reserved memory starting from

      specific memory address(0xa220000) should be set. More please

      refer to example.



required:

  - compatible

  - reg
@@ -47,7 +61,18 @@ examples: 
    /*

     * RTI WDT in main domain on J721e SoC. Assigned clocks are used to

     * select the source clock for the watchdog, forcing it to tick with

     * a 32kHz clock in this case.

     * a 32kHz clock in this case. Add a reserved memory(optional) to keep

     * the watchdog reset cause persistent, which was be written in 12 bytes

     * starting from 0xa2200000 by RTI Watchdog Firmware, then make it

     * possible to get watchdog reset cause in driver.

     *

     * Reserved memory should be defined as follows:

     * reserved-memory {

     *     wdt_reset_memory_region: wdt-memory@a2200000 {

     *         reg = <0x00 0xa2200000 0x00 0x1000>;

     *         no-map;

     *     };

     * }

     */

    #include <dt-bindings/soc/ti,sci_pm_domain.h>
@@ -58,4 +83,5 @@ examples: 
        power-domains = <&k3_pds 252 TI_SCI_PD_EXCLUSIVE>;

        assigned-clocks = <&k3_clks 252 1>;

        assigned-clock-parents = <&k3_clks 252 5>;

        memory-region = <&wdt_reset_memory_region>;

    };

drivers/watchdog/Kconfig

+55 −40
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ config XILINX_WATCHDOG 
config XILINX_WINDOW_WATCHDOG

	tristate "Xilinx window watchdog timer"

	depends on HAS_IOMEM

	depends on ARM64

	depends on ARM64 || COMPILE_TEST

	select WATCHDOG_CORE

	help

	  Window watchdog driver for the versal_wwdt IP core.
@@ -343,7 +343,7 @@ config RAVE_SP_WATCHDOG 


config MLX_WDT

	tristate "Mellanox Watchdog"

	depends on MELLANOX_PLATFORM

	depends on MELLANOX_PLATFORM || COMPILE_TEST

	select WATCHDOG_CORE

	select REGMAP

	help
@@ -493,7 +493,7 @@ config FTWDT010_WATCHDOG 


config IXP4XX_WATCHDOG

	tristate "IXP4xx Watchdog"

	depends on ARCH_IXP4XX

	depends on ARCH_IXP4XX || (ARM && COMPILE_TEST)

	select WATCHDOG_CORE

	help

	  Say Y here if to include support for the watchdog timer
@@ -529,7 +529,7 @@ config S3C2410_WATCHDOG 


config SA1100_WATCHDOG

	tristate "SA1100/PXA2xx watchdog"

	depends on ARCH_SA1100 || ARCH_PXA

	depends on ARCH_SA1100 || ARCH_PXA || COMPILE_TEST

	help

	  Watchdog timer embedded into SA11x0 and PXA2xx chips. This will

	  reboot your system when timeout is reached.
@@ -720,7 +720,7 @@ config IMX2_WDT 
config IMX_SC_WDT

	tristate "IMX SC Watchdog"

	depends on HAVE_ARM_SMCCC

	depends on IMX_SCU

	depends on IMX_SCU || COMPILE_TEST

	select WATCHDOG_CORE

	help

	  This is the driver for the system controller watchdog
@@ -931,7 +931,7 @@ config ASPEED_WATCHDOG 


config STM32_WATCHDOG

	tristate "STM32 Independent WatchDoG (IWDG) support"

	depends on ARCH_STM32

	depends on ARCH_STM32 || COMPILE_TEST

	select WATCHDOG_CORE

	default y

	help
@@ -1065,7 +1065,7 @@ config ACQUIRE_WDT 


config ADVANTECH_WDT

	tristate "Advantech SBC Watchdog Timer"

	depends on X86

	depends on X86 || COMPILE_TEST

	help

	  If you are configuring a Linux kernel for the Advantech single-board

	  computer, say `Y' here to support its built-in watchdog timer
@@ -1074,14 +1074,16 @@ config ADVANTECH_WDT 


config ADVANTECH_EC_WDT

	tristate "Advantech Embedded Controller Watchdog Timer"

	depends on X86

	depends on X86 || COMPILE_TEST

	select ISA_BUS_API

	select WATCHDOG_CORE

	help

		This driver supports Advantech products with ITE based Embedded Controller.

		It does not support Advantech products with other ECs or without EC.



config ALIM1535_WDT

	tristate "ALi M1535 PMU Watchdog Timer"

	depends on X86 && PCI

	depends on (X86 || COMPILE_TEST) && PCI

	help

	  This is the driver for the hardware watchdog on the ALi M1535 PMU.
@@ -1105,7 +1107,7 @@ config ALIM7101_WDT 


config EBC_C384_WDT

	tristate "WinSystems EBC-C384 Watchdog Timer"

	depends on X86

	depends on X86 || COMPILE_TEST

	select ISA_BUS_API

	select WATCHDOG_CORE

	help
@@ -1115,7 +1117,7 @@ config EBC_C384_WDT 


config EXAR_WDT

	tristate "Exar Watchdog Timer"

	depends on X86

	depends on X86 || COMPILE_TEST

	select WATCHDOG_CORE

	help

	  Enables watchdog timer support for the watchdog timer present
@@ -1126,7 +1128,7 @@ config EXAR_WDT 


config F71808E_WDT

	tristate "Fintek F718xx, F818xx Super I/O Watchdog"

	depends on X86

	depends on X86 || COMPILE_TEST

	select WATCHDOG_CORE

	help

	  This is the driver for the hardware watchdog on the Fintek F71808E,
@@ -1138,7 +1140,7 @@ config F71808E_WDT 


config SP5100_TCO

	tristate "AMD/ATI SP5100 TCO Timer/Watchdog"

	depends on X86 && PCI

	depends on (X86 || COMPILE_TEST) && PCI

	select WATCHDOG_CORE

	help

	  Hardware watchdog driver for the AMD/ATI SP5100 chipset. The TCO
@@ -1177,7 +1179,7 @@ config SC520_WDT 


config SBC_FITPC2_WATCHDOG

	tristate "Compulab SBC-FITPC2 watchdog"

	depends on X86

	depends on X86 || COMPILE_TEST

	help

	  This is the driver for the built-in watchdog timer on the fit-PC2,

	  fit-PC2i, CM-iAM single-board computers made by Compulab.
@@ -1202,7 +1204,7 @@ config SBC_FITPC2_WATCHDOG 


config EUROTECH_WDT

	tristate "Eurotech CPU-1220/1410 Watchdog Timer"

	depends on X86

	depends on X86 || COMPILE_TEST

	help

	  Enable support for the watchdog timer on the Eurotech CPU-1220 and

	  CPU-1410 cards.  These are PC/104 SBCs. Spec sheets and product
@@ -1210,7 +1212,7 @@ config EUROTECH_WDT 


config IB700_WDT

	tristate "IB700 SBC Watchdog Timer"

	depends on X86

	depends on X86 || COMPILE_TEST

	help

	  This is the driver for the hardware watchdog on the IB700 Single

	  Board Computer produced by TMC Technology (www.tmc-uk.com). This
@@ -1227,7 +1229,7 @@ config IB700_WDT 


config IBMASR

	tristate "IBM Automatic Server Restart"

	depends on X86

	depends on X86 || COMPILE_TEST

	help

	  This is the driver for the IBM Automatic Server Restart watchdog

	  timer built-in into some eServer xSeries machines.
@@ -1237,7 +1239,7 @@ config IBMASR 


config WAFER_WDT

	tristate "ICP Single Board Computer Watchdog Timer"

	depends on X86

	depends on X86 || COMPILE_TEST

	help

	  This is a driver for the hardware watchdog on the ICP Single

	  Board Computer. This driver is working on (at least) the following
@@ -1259,7 +1261,7 @@ config I6300ESB_WDT 


config IE6XX_WDT

	tristate "Intel Atom E6xx Watchdog"

	depends on X86 && PCI

	depends on (X86 || COMPILE_TEST) && PCI

	select WATCHDOG_CORE

	select MFD_CORE

	select LPC_SCH
@@ -1319,7 +1321,7 @@ config ITCO_VENDOR_SUPPORT 


config IT8712F_WDT

	tristate "IT8712F (Smart Guardian) Watchdog Timer"

	depends on X86

	depends on X86 || COMPILE_TEST

	help

	  This is the driver for the built-in watchdog timer on the IT8712F

	  Super I/0 chipset used on many motherboards.
@@ -1332,7 +1334,7 @@ config IT8712F_WDT 


config IT87_WDT

	tristate "IT87 Watchdog Timer"

	depends on X86

	depends on X86 || COMPILE_TEST

	select WATCHDOG_CORE

	help

	  This is the driver for the hardware watchdog on the ITE IT8607,
@@ -1350,7 +1352,7 @@ config IT87_WDT 
config HP_WATCHDOG

	tristate "HP ProLiant iLO2+ Hardware Watchdog Timer"

	select WATCHDOG_CORE

	depends on (ARM64 || X86) && PCI

	depends on (ARM64 || X86 || COMPILE_TEST) && PCI

	help

	  A software monitoring watchdog and NMI handling driver. This driver

	  will detect lockups and provide a stack trace. This is a driver that
@@ -1380,7 +1382,7 @@ config KEMPLD_WDT 


config SC1200_WDT

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

	depends on X86

	depends on X86 || COMPILE_TEST

	help

	  This is a driver for National Semiconductor PC87307/PC97307 hardware

	  watchdog cards as found on the SC1200. This watchdog is mainly used
@@ -1403,7 +1405,7 @@ config SCx200_WDT 


config PC87413_WDT

	tristate "NS PC87413 watchdog"

	depends on X86

	depends on X86 || COMPILE_TEST

	help

	  This is the driver for the hardware watchdog on the PC87413 chipset

	  This watchdog simply watches your kernel to make sure it doesn't
@@ -1417,7 +1419,7 @@ config PC87413_WDT 


config NV_TCO

	tristate "nVidia TCO Timer/Watchdog"

	depends on X86 && PCI

	depends on (X86 || COMPILE_TEST) && PCI

	help

	  Hardware driver for the TCO timer built into the nVidia Hub family

	  (such as the MCP51).  The TCO (Total Cost of Ownership) timer is a
@@ -1446,7 +1448,7 @@ config RDC321X_WDT 


config 60XX_WDT

	tristate "SBC-60XX Watchdog Timer"

	depends on X86

	depends on X86 || COMPILE_TEST

	help

	  This driver can be used with the watchdog timer found on some

	  single board computers, namely the 6010 PII based computer.
@@ -1486,7 +1488,7 @@ config SBC7240_WDT 


config CPU5_WDT

	tristate "SMA CPU5 Watchdog"

	depends on X86

	depends on X86 || COMPILE_TEST

	help

	  TBD.

	  To compile this driver as a module, choose M here: the
@@ -1494,7 +1496,7 @@ config CPU5_WDT 


config SMSC_SCH311X_WDT

	tristate "SMSC SCH311X Watchdog Timer"

	depends on X86

	depends on X86 || COMPILE_TEST

	help

	  This is the driver for the hardware watchdog timer on the

	  SMSC SCH3112, SCH3114 and SCH3116 Super IO chipset
@@ -1506,7 +1508,7 @@ config SMSC_SCH311X_WDT 


config SMSC37B787_WDT

	tristate "Winbond SMsC37B787 Watchdog Timer"

	depends on X86

	depends on X86 || COMPILE_TEST

	help

	  This is the driver for the hardware watchdog component on the

	  Winbond SMsC37B787 chipset as used on the NetRunner Mainboard
@@ -1526,7 +1528,7 @@ config SMSC37B787_WDT 


config TQMX86_WDT

	tristate "TQ-Systems TQMX86 Watchdog Timer"

	depends on X86

	depends on X86 || COMPILE_TEST

	select WATCHDOG_CORE

	help

	  This is the driver for the hardware watchdog timer in the TQMX86 IO
@@ -1539,7 +1541,7 @@ config TQMX86_WDT 


config VIA_WDT

	tristate "VIA Watchdog Timer"

	depends on X86 && PCI

	depends on (X86 || COMPILE_TEST) && PCI

	select WATCHDOG_CORE

	help

	  This is the driver for the hardware watchdog timer on VIA
@@ -1552,7 +1554,7 @@ config VIA_WDT 


config W83627HF_WDT

	tristate "Watchdog timer for W83627HF/W83627DHG and compatibles"

	depends on X86

	depends on X86 || COMPILE_TEST

	select WATCHDOG_CORE

	help

	  This is the driver for the hardware watchdog on the following
@@ -1582,7 +1584,7 @@ config W83627HF_WDT 


config W83877F_WDT

	tristate "W83877F (EMACS) Watchdog Timer"

	depends on X86

	depends on X86 || COMPILE_TEST

	help

	  This is the driver for the hardware watchdog on the W83877F chipset

	  as used in EMACS PC-104 motherboards (and likely others).  This
@@ -1597,7 +1599,7 @@ config W83877F_WDT 


config W83977F_WDT

	tristate "W83977F (PCM-5335) Watchdog Timer"

	depends on X86

	depends on X86 || COMPILE_TEST

	help

	  This is the driver for the hardware watchdog on the W83977F I/O chip

	  as used in AAEON's PCM-5335 SBC (and likely others).  This
@@ -1610,7 +1612,7 @@ config W83977F_WDT 


config MACHZ_WDT

	tristate "ZF MachZ Watchdog"

	depends on X86

	depends on X86 || COMPILE_TEST

	help

	  If you are using a ZF Micro MachZ processor, say Y here, otherwise

	  N.  This is the driver for the watchdog timer built-in on that
@@ -1623,7 +1625,7 @@ config MACHZ_WDT 


config SBC_EPX_C3_WATCHDOG

	tristate "Winsystems SBC EPX-C3 watchdog"

	depends on X86

	depends on X86 || COMPILE_TEST

	help

	  This is the driver for the built-in watchdog timer on the EPX-C3

	  Single-board computer made by Winsystems, Inc.
@@ -1739,7 +1741,7 @@ config INDYDOG 


config JZ4740_WDT

	tristate "Ingenic jz4740 SoC hardware watchdog"

	depends on MIPS

	depends on MIPS || COMPILE_TEST

	depends on COMMON_CLK

	select WATCHDOG_CORE

	select MFD_SYSCON
@@ -1798,6 +1800,19 @@ config OCTEON_WDT 
	  from the first interrupt, it is then only poked when the

	  device is written.



config MARVELL_GTI_WDT

	tristate "Marvell GTI Watchdog driver"

	depends on ARCH_THUNDER || (COMPILE_TEST && 64BIT)

	default y

	select WATCHDOG_CORE

	help

	  Marvell GTI hardware supports watchdog timer. First timeout

	  works as watchdog pretimeout and installed interrupt handler

	  will be called on first timeout. Hardware can generate interrupt

	  to SCP on second timeout but it is not enabled, so second

	  timeout is ignored. If device poke does not happen then system

	  will reboot on third timeout.



config BCM2835_WDT

	tristate "Broadcom BCM2835 hardware watchdog"

	depends on ARCH_BCM2835 || (OF && COMPILE_TEST)
@@ -1823,7 +1838,7 @@ config BCM_KONA_WDT 


config BCM_KONA_WDT_DEBUG

	bool "DEBUGFS support for BCM Kona Watchdog"

	depends on BCM_KONA_WDT

	depends on BCM_KONA_WDT || COMPILE_TEST

	help

	  If enabled, adds /sys/kernel/debug/bcm_kona_wdt/info which provides

	  access to the driver's internal data structures as well as watchdog
@@ -1864,7 +1879,7 @@ config LANTIQ_WDT 


config LOONGSON1_WDT

	tristate "Loongson1 SoC hardware watchdog"

	depends on MACH_LOONGSON32

	depends on MACH_LOONGSON32 || COMPILE_TEST

	select WATCHDOG_CORE

	help

	  Hardware driver for the Loongson1 SoC Watchdog Timer.
@@ -1878,7 +1893,7 @@ config RALINK_WDT 


config GXP_WATCHDOG

	tristate "HPE GXP watchdog support"

	depends on ARCH_HPE_GXP

	depends on ARCH_HPE_GXP || COMPILE_TEST

	select WATCHDOG_CORE

	help

	  Say Y here to include support for the watchdog timer