5.4-stable patches

added patches:
	watchdog-sp5100_tco-immediately-trigger-upon-starting.patch

diff --git a/queue-5.4/series b/queue-5.4/series
index 12bec450850c713c2de18cda4e6dce513b26f91e..6dcd1fe08ece146370da51e617f882c2a0b4599f 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -120,3 +120,4 @@ vc_screen-rewrite-vcs_size-to-accept-vc-not-inode.patch
 vc_screen-reload-load-of-struct-vc_data-pointer-in-v.patch
 s390-qdio-get-rid-of-register-asm.patch
 s390-qdio-fix-do_sqbs-inline-assembly-constraint.patch
+watchdog-sp5100_tco-immediately-trigger-upon-starting.patch

diff --git a/queue-5.4/watchdog-sp5100_tco-immediately-trigger-upon-starting.patch b/queue-5.4/watchdog-sp5100_tco-immediately-trigger-upon-starting.patch
new file mode 100644 (file)
index 0000000..e739a79
--- /dev/null
+++ b/queue-5.4/watchdog-sp5100_tco-immediately-trigger-upon-starting.patch
@@ -0,0 +1,41 @@
+From 4eda19cc8a29cde3580ed73bf11dc73b4e757697 Mon Sep 17 00:00:00 2001
+From: Gregory Oakes <gregory.oakes@amd.com>
+Date: Thu, 16 Mar 2023 15:13:12 -0500
+Subject: watchdog: sp5100_tco: Immediately trigger upon starting.
+
+From: Gregory Oakes <gregory.oakes@amd.com>
+
+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 <gregory.oakes@amd.com>
+Reviewed-by: Guenter Roeck <linux@roeck-us.net>
+Link: https://lore.kernel.org/r/20230316201312.17538-1-gregory.oakes@amd.com
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
+Cc: Mario Limonciello <mario.limonciello@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/watchdog/sp5100_tco.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/watchdog/sp5100_tco.c
++++ b/drivers/watchdog/sp5100_tco.c
+@@ -98,6 +98,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;
+ }
+