This is a note to let you know that I've just added the patch titled Watchdog: sp5100_tco: Move timer initialization into function to the 5.17-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: watchdog-sp5100_tco-move-timer-initialization-into-function.patch and it can be found in the queue-5.17 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From abd71a948f7aab47ca49d3e7fe6afa6c48c8aae0 Mon Sep 17 00:00:00 2001 From: Terry Bowman <terry.bowman@xxxxxxx> Date: Wed, 2 Feb 2022 09:35:22 -0600 Subject: Watchdog: sp5100_tco: Move timer initialization into function From: Terry Bowman <terry.bowman@xxxxxxx> commit abd71a948f7aab47ca49d3e7fe6afa6c48c8aae0 upstream. Refactor driver's timer initialization into new function. This is needed inorder to support adding new device layouts while using common timer initialization. Co-developed-by: Robert Richter <rrichter@xxxxxxx> Signed-off-by: Robert Richter <rrichter@xxxxxxx> Signed-off-by: Terry Bowman <terry.bowman@xxxxxxx> Tested-by: Jean Delvare <jdelvare@xxxxxxx> Reviewed-by: Jean Delvare <jdelvare@xxxxxxx> Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx> Link: https://lore.kernel.org/r/20220202153525.1693378-2-terry.bowman@xxxxxxx Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx> Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxxxxxxxxxxx> Cc: Mario Limonciello <Mario.Limonciello@xxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/watchdog/sp5100_tco.c | 65 +++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 29 deletions(-) --- a/drivers/watchdog/sp5100_tco.c +++ b/drivers/watchdog/sp5100_tco.c @@ -223,6 +223,41 @@ static u32 sp5100_tco_read_pm_reg32(u8 i return val; } +static int sp5100_tco_timer_init(struct sp5100_tco *tco) +{ + struct watchdog_device *wdd = &tco->wdd; + struct device *dev = wdd->parent; + u32 val; + + val = readl(SP5100_WDT_CONTROL(tco->tcobase)); + if (val & SP5100_WDT_DISABLED) { + dev_err(dev, "Watchdog hardware is disabled\n"); + return -ENODEV; + } + + /* + * Save WatchDogFired status, because WatchDogFired flag is + * cleared here. + */ + if (val & SP5100_WDT_FIRED) + wdd->bootstatus = WDIOF_CARDRESET; + + /* Set watchdog action to reset the system */ + val &= ~SP5100_WDT_ACTION_RESET; + writel(val, SP5100_WDT_CONTROL(tco->tcobase)); + + /* Set a reasonable heartbeat before we stop the timer */ + tco_timer_set_timeout(wdd, wdd->timeout); + + /* + * Stop the TCO before we change anything so we don't race with + * a zeroed timer. + */ + tco_timer_stop(wdd); + + return 0; +} + static int sp5100_tco_setupdevice(struct device *dev, struct watchdog_device *wdd) { @@ -348,35 +383,7 @@ static int sp5100_tco_setupdevice(struct /* Setup the watchdog timer */ tco_timer_enable(tco); - val = readl(SP5100_WDT_CONTROL(tco->tcobase)); - if (val & SP5100_WDT_DISABLED) { - dev_err(dev, "Watchdog hardware is disabled\n"); - ret = -ENODEV; - goto unreg_region; - } - - /* - * Save WatchDogFired status, because WatchDogFired flag is - * cleared here. - */ - if (val & SP5100_WDT_FIRED) - wdd->bootstatus = WDIOF_CARDRESET; - /* Set watchdog action to reset the system */ - val &= ~SP5100_WDT_ACTION_RESET; - writel(val, SP5100_WDT_CONTROL(tco->tcobase)); - - /* Set a reasonable heartbeat before we stop the timer */ - tco_timer_set_timeout(wdd, wdd->timeout); - - /* - * Stop the TCO before we change anything so we don't race with - * a zeroed timer. - */ - tco_timer_stop(wdd); - - release_region(SP5100_IO_PM_INDEX_REG, SP5100_PM_IOPORTS_SIZE); - - return 0; + ret = sp5100_tco_timer_init(tco); unreg_region: release_region(SP5100_IO_PM_INDEX_REG, SP5100_PM_IOPORTS_SIZE); Patches currently in stable-queue which might be from terry.bowman@xxxxxxx are queue-5.17/watchdog-sp5100_tco-add-initialization-using-efch-mmio.patch queue-5.17/i2c-piix4-add-efch-mmio-support-to-region-request-and-release.patch queue-5.17/i2c-piix4-move-smbus-port-selection-into-function.patch queue-5.17/i2c-piix4-add-efch-mmio-support-to-smbus-base-address-detect.patch queue-5.17/i2c-piix4-move-port-i-o-region-request-release-code-into-functions.patch queue-5.17/i2c-piix4-replace-hardcoded-memory-map-size-with-a-define.patch queue-5.17/kernel-resource-introduce-request_mem_region_muxed.patch queue-5.17/i2c-piix4-enable-efch-mmio-for-family-17h.patch queue-5.17/watchdog-sp5100_tco-enable-family-17h-cpus.patch queue-5.17/watchdog-sp5100_tco-move-timer-initialization-into-function.patch queue-5.17/i2c-piix4-add-efch-mmio-support-for-smbus-port-select.patch queue-5.17/watchdog-sp5100_tco-refactor-mmio-base-address-initialization.patch queue-5.17/i2c-piix4-move-smbus-controller-base-address-detect-into-function.patch