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

Commit c1c66ab9 authored by Mika Westerberg's avatar Mika Westerberg Committed by Greg Kroah-Hartman
Browse files

watchdog: iTCO_wdt: No need to stop the timer in probe 



commit 1ae3e78c08209ac657c59f6f7ea21bbbd7f6a1d4 upstream.

The watchdog core can handle pinging of the watchdog before userspace
opens the device. For this reason instead of stopping the timer, just
mark it as running and let the watchdog core take care of it.

Cc: Malin Jonsson <malin.jonsson@ericsson.com>
Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20210921102900.61586-1-mika.westerberg@linux.intel.com


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c81e46a8

drivers/watchdog/iTCO_wdt.c

+11 −2
Original line number Diff line number Diff line
@@ -401,6 +401,16 @@ static unsigned int iTCO_wdt_get_timeleft(struct watchdog_device *wd_dev) 
	return time_left;

}



static void iTCO_wdt_set_running(struct iTCO_wdt_private *p)

{

	u16 val;



	/* Bit 11: TCO Timer Halt -> 0 = The TCO timer is * enabled */

	val = inw(TCO1_CNT(p));

	if (!(val & BIT(11)))

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

}



/*

 *	Kernel Interfaces

 */
@@ -537,8 +547,7 @@ static int iTCO_wdt_probe(struct platform_device *pdev) 
	watchdog_set_drvdata(&p->wddev, p);

	platform_set_drvdata(pdev, p);



	/* Make sure the watchdog is not running */

	iTCO_wdt_stop(&p->wddev);

	iTCO_wdt_set_running(p);



	/* Check that the heartbeat value is within it's range;

	   if not reset to the default */