Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b68d1742 authored by Armin Wolf's avatar Armin Wolf Committed by Greg Kroah-Hartman
Browse files

hwmon: (sch56xx-common) Replace WDOG_ACTIVE with WDOG_HW_RUNNING 



[ Upstream commit 647d6f09bea7dacf4cdb6d4ea7e3051883955297 ]

If the watchdog was already enabled by the BIOS after booting, the
watchdog infrastructure needs to regularly send keepalives to
prevent a unexpected reset.
WDOG_ACTIVE only serves as an status indicator for userspace,
we want to use WDOG_HW_RUNNING instead.

Since my Fujitsu Esprimo P720 does not support the watchdog,
this change is compile-tested only.

Suggested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Fixes: fb551405 (watchdog: sch56xx: Use watchdog core)
Signed-off-by: default avatarArmin Wolf <W_Armin@gmx.de>
Link: https://lore.kernel.org/r/20220131211935.3656-5-W_Armin@gmx.de


Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent bf78aca8

drivers/hwmon/sch56xx-common.c

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ struct sch56xx_watchdog_data *sch56xx_watchdog_register(struct device *parent, 
	if (nowayout)

		set_bit(WDOG_NO_WAY_OUT, &data->wddev.status);

	if (output_enable & SCH56XX_WDOG_OUTPUT_ENABLE)

		set_bit(WDOG_ACTIVE, &data->wddev.status);

		set_bit(WDOG_HW_RUNNING, &data->wddev.status);



	/* Since the watchdog uses a downcounter there is no register to read

	   the BIOS set timeout from (if any was set at all) ->