From: Greg Kroah-Hartman Date: Fri, 26 May 2023 14:05:52 +0000 (+0100) Subject: 5.15-stable patches X-Git-Tag: review~89 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4a92013cda33cb3f05424c32c27ce56bbdb69d7;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: watchdog-sp5100_tco-immediately-trigger-upon-starting.patch --- diff --git a/queue-5.15/series b/queue-5.15/series index a261eb5f87a..6469057fab6 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -2,3 +2,4 @@ usb-gadget-properly-configure-the-device-for-remote-.patch usb-dwc3-fix-gadget-mode-suspend-interrupt-handler-i.patch dt-bindings-ata-ahci-ceva-convert-to-yaml.patch dt-bindings-ata-ahci-ceva-cover-all-4-iommus-entries.patch +watchdog-sp5100_tco-immediately-trigger-upon-starting.patch diff --git a/queue-5.15/watchdog-sp5100_tco-immediately-trigger-upon-starting.patch b/queue-5.15/watchdog-sp5100_tco-immediately-trigger-upon-starting.patch new file mode 100644 index 00000000000..9e755ff88a9 --- /dev/null +++ b/queue-5.15/watchdog-sp5100_tco-immediately-trigger-upon-starting.patch @@ -0,0 +1,41 @@ +From 4eda19cc8a29cde3580ed73bf11dc73b4e757697 Mon Sep 17 00:00:00 2001 +From: Gregory Oakes +Date: Thu, 16 Mar 2023 15:13:12 -0500 +Subject: watchdog: sp5100_tco: Immediately trigger upon starting. + +From: Gregory Oakes + +commit 4eda19cc8a29cde3580ed73bf11dc73b4e757697 upstream. + +The watchdog countdown is supposed to begin when the device file is +opened. Instead, it would begin countdown upon the first write to or +close of the device file. Now, the ping operation is called within the +start operation which ensures the countdown begins. From experimenation, +it does not appear possible to do this with a single write including +both the start bit and the trigger bit. So, it is done as two distinct +writes. + +Signed-off-by: Gregory Oakes +Reviewed-by: Guenter Roeck +Link: https://lore.kernel.org/r/20230316201312.17538-1-gregory.oakes@amd.com +Signed-off-by: Guenter Roeck +Signed-off-by: Wim Van Sebroeck +Cc: Mario Limonciello +Signed-off-by: Greg Kroah-Hartman +--- + drivers/watchdog/sp5100_tco.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/watchdog/sp5100_tco.c ++++ b/drivers/watchdog/sp5100_tco.c +@@ -108,6 +108,10 @@ static int tco_timer_start(struct watchd + val |= SP5100_WDT_START_STOP_BIT; + writel(val, SP5100_WDT_CONTROL(tco->tcobase)); + ++ /* This must be a distinct write. */ ++ val |= SP5100_WDT_TRIGGER_BIT; ++ writel(val, SP5100_WDT_CONTROL(tco->tcobase)); ++ + return 0; + } +