linux-stable.git/drivers/watchdog, branch linux-6.5.y

sbsa_gwdt: Calculate timeout with 64-bit math

2023-11-28T17:15:12+00:00

commit 5d6aa89bba5bd6af2580f872b57f438dab883738 upstream.

Commit abd3ac7902fb ("watchdog: sbsa: Support architecture version 1")
introduced new timer math for watchdog revision 1 with the 48 bit offset
register.

The gwdt->clk and timeout are u32, but the argument being calculated is
u64. Without a cast, the compiler performs u32 operations, truncating
intermediate steps, resulting in incorrect values.

A watchdog revision 1 implementation with a gwdt->clk of 1GHz and a
timeout of 600s writes 3647256576 to the one shot watchdog instead of
300000000000, resulting in the watchdog firing in 3.6s instead of 600s.

Force u64 math by casting the first argument (gwdt->clk) as a u64. Make
the order of operations explicit with parenthesis.

Fixes: abd3ac7902fb ("watchdog: sbsa: Support architecture version 1")
Reported-by: Vanshidhar Konda 
Signed-off-by: Darren Hart 
Cc: Wim Van Sebroeck 
Cc: Guenter Roeck 
Cc: linux-watchdog@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc:  # 5.14.x
Reviewed-by: Guenter Roeck 
Link: https://lore.kernel.org/r/7d1713c5ffab19b0f3de796d82df19e8b1f340de.1695286124.git.darren@os.amperecomputing.com
Signed-off-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck 
Signed-off-by: Greg Kroah-Hartman

watchdog: ixp4xx: Make sure restart always works

2023-11-20T10:57:21+00:00

[ Upstream commit b4075ecfe348a44209534c75ad72392c63a489a6 ]

The IXP4xx watchdog in early "A0" silicon is unreliable and
cannot be registered, however for some systems such as the
USRobotics USR8200 the watchdog is the only restart option,
so implement a "dummy" watchdog that can only support restart
in this case.

Fixes: 1aea522809e6 ("watchdog: ixp4xx: Implement restart")
Signed-off-by: Linus Walleij 
Reviewed-by: Guenter Roeck 
Link: https://lore.kernel.org/r/20230926-ixp4xx-wdt-restart-v2-1-15cf4639b423@linaro.org
Signed-off-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck 
Signed-off-by: Sasha Levin

watchdog: advantech_ec_wdt: fix Kconfig dependencies

2023-09-19T10:30:21+00:00

commit 6eb28a38f6478a650c7e76b2d6910669615d8a62 upstream.

This driver uses the WATCHDOG_CORE framework and ISA_BUS_API.
This commit has these dependencies correctly selected.

Signed-off-by: Florent CARLI 
Co-authored-by: Yoann Congal 
Reviewed-by: Guenter Roeck 
Link: https://lore.kernel.org/r/20230721081347.52069-1-fcarli@gmail.com
Signed-off-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck 
Cc: Yoann Congal 
Signed-off-by: Greg Kroah-Hartman

watchdog: intel-mid_wdt: add MODULE_ALIAS() to allow auto-load

2023-09-19T10:30:15+00:00

[ Upstream commit cf38e7691c85f1b09973b22a0b89bf1e1228d2f9 ]

When built with CONFIG_INTEL_MID_WATCHDOG=m, currently the driver
needs to be loaded manually, for the lack of module alias.
This causes unintended resets in cases where watchdog timer is
set-up by bootloader and the driver is not explicitly loaded.
Add MODULE_ALIAS() to load the driver automatically at boot and
avoid this issue.

Fixes: 87a1ef8058d9 ("watchdog: add Intel MID watchdog driver support")
Signed-off-by: Raag Jadav 
Reviewed-by: Andy Shevchenko 
Reviewed-by: Guenter Roeck 
Link: https://lore.kernel.org/r/20230811120220.31578-1-raag.jadav@intel.com
Signed-off-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck 
Signed-off-by: Sasha Levin

watchdog: sp5100_tco: support Hygon FCH/SCH (Server Controller Hub)

2023-06-26T12:30:07+00:00

Add PCI_VENDOR_ID_HYGON(Hygon vendor id [0x1d94]) in this driver

Signed-off-by: Yuechao Zhao 
Reviewed-by: Guenter Roeck 
Link: https://lkml.kernel.org/r/20230612031907.796461-1-a345351830@gmail.com
Signed-off-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: xilinx_wwdt: Add Versal window watchdog support

2023-06-26T12:30:06+00:00

Versal watchdog driver uses window watchdog mode. Window watchdog
timer(WWDT) contains closed(first) and open(second) window with
32 bit width. Write to the watchdog timer within predefined window
periods of time. This means a period that is not too soon and a
period that is not too late. The WWDT has to be restarted within
the open window time. If software tries to restart WWDT outside of
the open window time period, it generates a reset.

Signed-off-by: Srinivas Neeli 
Reviewed-by: Guenter Roeck 
Link: https://lkml.kernel.org/r/20230420104231.2243079-4-srinivas.neeli@amd.com
Signed-off-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: ziirave_wdt: Switch i2c driver back to use .probe()

2023-06-26T12:30:05+00:00

After commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new()
call-back type"), all drivers being converted to .probe_new() and then
03c835f498b5 ("i2c: Switch .probe() to not take an id parameter")
convert back to (the new) .probe() to be able to eventually drop
.probe_new() from struct i2c_driver.

Signed-off-by: Uwe Kleine-König 
Reviewed-by: Guenter Roeck 
Link: https://lkml.kernel.org/r/20230525210837.735447-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: ibmasr: Replace GPL license notice with SPDX identifier

2023-06-26T12:30:05+00:00

Replace unversioned GPL license notice with appropriate SPDX license
identifier, which is GPL 1.0+.

Cc: Andrey Panin 
Signed-off-by: Bagas Sanjaya 
Reviewed-by: Guenter Roeck 
Link: https://lkml.kernel.org/r/20230517072140.1086660-3-bagasdotme@gmail.com
Signed-off-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: Convert GPL 2.0 notice to SPDX identifier

2023-06-26T12:30:04+00:00

Convert the boilerplate to SPDX license identifier. While at it, also
move SPDX identifier for drivers/watchdog/rtd119x_wdt.c to the top of
file (as in other files).

Cc: Ray Lehtiniemi ,
Cc: Alessandro Zummo 
Cc: H Hartley Sweeten 
Cc: Deepak Saxena 
Cc: Marc Zyngier 
Cc: Jonas Jensen 
Cc: Sylver Bruneau 
Cc: Denis Turischev 
Cc: Mika Westerberg 
Acked-by: Andreas Färber 
Signed-off-by: Bagas Sanjaya 
Acked-by: Mika Westerberg 
Acked-by: Ray Lehtiniemi 
Reviewed-by: Guenter Roeck 
Link: https://lkml.kernel.org/r/20230517072140.1086660-2-bagasdotme@gmail.com
Signed-off-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck

watchdog: loongson1_wdt: Add DT support

2023-06-26T12:30:04+00:00

This patch adds the of_match_table to enable DT support
of Loongson-1 watchdog driver.
And modify the parameter of devm_clk_get_enabled() accordingly.

Signed-off-by: Keguang Zhang 
Reviewed-by: Guenter Roeck 
Link: https://lkml.kernel.org/r/20230511121159.463645-3-keguang.zhang@gmail.com
Signed-off-by: Guenter Roeck 
Signed-off-by: Wim Van Sebroeck