Fixes for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/series b/queue-4.14/series
index acf31d7cdcc821f6f5d863a5c825e95f330ebcea..7fdc0f815a438133a22dbd08213156cefcf9ccd2 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -17,3 +17,5 @@ ata-libata-eh-do-not-clear-ata_pflag_eh_pending-in-a.patch
 fbdev-sh7760fb-depend-on-fb-y.patch
 ata-ahci-drop-pointless-vprintk-calls-and-convert-th.patch
 ata-libahci-clear-pending-interrupt-status.patch
+watchdog-itco_wdt-no-need-to-stop-the-timer-in-probe.patch
+watchdog-itco_wdt-set-no_reboot-if-the-watchdog-is-n.patch

diff --git a/queue-4.14/watchdog-itco_wdt-no-need-to-stop-the-timer-in-probe.patch b/queue-4.14/watchdog-itco_wdt-no-need-to-stop-the-timer-in-probe.patch
new file mode 100644 (file)
index 0000000..98053f5
--- /dev/null
+++ b/queue-4.14/watchdog-itco_wdt-no-need-to-stop-the-timer-in-probe.patch
@@ -0,0 +1,58 @@
+From 5531af601af8325c3ecfa9c36d4a69ba33c44242 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 2 Oct 2023 09:05:39 +0200
+Subject: watchdog: iTCO_wdt: No need to stop the timer in probe
+
+From: Mika Westerberg <mika.westerberg@linux.intel.com>
+
+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: Mika Westerberg <mika.westerberg@linux.intel.com>
+Reviewed-by: Guenter Roeck <linux@roeck-us.net>
+Link: https://lore.kernel.org/r/20210921102900.61586-1-mika.westerberg@linux.intel.com
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/watchdog/iTCO_wdt.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
+index 347f0389b0899..930798bac582d 100644
+--- a/drivers/watchdog/iTCO_wdt.c
++++ b/drivers/watchdog/iTCO_wdt.c
+@@ -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 */
+-- 
+2.40.1
+

diff --git a/queue-4.14/watchdog-itco_wdt-set-no_reboot-if-the-watchdog-is-n.patch b/queue-4.14/watchdog-itco_wdt-set-no_reboot-if-the-watchdog-is-n.patch
new file mode 100644 (file)
index 0000000..5358928
--- /dev/null
+++ b/queue-4.14/watchdog-itco_wdt-set-no_reboot-if-the-watchdog-is-n.patch
@@ -0,0 +1,96 @@
+From 7c097242e241dc046d3d9dcc3fb635a68e101db8 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 2 Oct 2023 09:05:40 +0200
+Subject: watchdog: iTCO_wdt: Set NO_REBOOT if the watchdog is not already
+ running
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Mika Westerberg <mika.westerberg@linux.intel.com>
+
+commit ef9b7bf52c2f47f0a9bf988543c577b92c92d15e upstream.
+
+Daniel reported that the commit 1ae3e78c0820 ("watchdog: iTCO_wdt: No
+need to stop the timer in probe") makes QEMU implementation of the iTCO
+watchdog not to trigger reboot anymore when NO_REBOOT flag is initially
+cleared using this option (in QEMU command line):
+
+  -global ICH9-LPC.noreboot=false
+
+The problem with the commit is that it left the unconditional setting of
+NO_REBOOT that is not cleared anymore when the kernel keeps pinging the
+watchdog (as opposed to the previous code that called iTCO_wdt_stop()
+that cleared it).
+
+Fix this so that we only set NO_REBOOT if the watchdog was not initially
+running.
+
+Fixes: 1ae3e78c0820 ("watchdog: iTCO_wdt: No need to stop the timer in probe")
+Reported-by: Daniel P. Berrangé <berrange@redhat.com>
+Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
+Tested-by: Daniel P. Berrangé <berrange@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+Reviewed-by: Guenter Roeck <linux@roeck-us.net>
+Link: https://lore.kernel.org/r/20221028062750.45451-1-mika.westerberg@linux.intel.com
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/watchdog/iTCO_wdt.c | 21 ++++++++++++++-------
+ 1 file changed, 14 insertions(+), 7 deletions(-)
+
+diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
+index 930798bac582d..5ec52032117a7 100644
+--- a/drivers/watchdog/iTCO_wdt.c
++++ b/drivers/watchdog/iTCO_wdt.c
+@@ -401,14 +401,18 @@ 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)
++/* Returns true if the watchdog was running */
++static bool iTCO_wdt_set_running(struct iTCO_wdt_private *p)
+ {
+       u16 val;
+ 
+-      /* Bit 11: TCO Timer Halt -> 0 = The TCO timer is * enabled */
++      /* Bit 11: TCO Timer Halt -> 0 = The TCO timer is enabled */
+       val = inw(TCO1_CNT(p));
+-      if (!(val & BIT(11)))
++      if (!(val & BIT(11))) {
+               set_bit(WDOG_HW_RUNNING, &p->wddev.status);
++              return true;
++      }
++      return false;
+ }
+ 
+ /*
+@@ -486,9 +490,6 @@ static int iTCO_wdt_probe(struct platform_device *pdev)
+               return -ENODEV; /* Cannot reset NO_REBOOT bit */
+       }
+ 
+-      /* Set the NO_REBOOT bit to prevent later reboots, just for sure */
+-      p->update_no_reboot_bit(p->no_reboot_priv, true);
+-
+       /* The TCO logic uses the TCO_EN bit in the SMI_EN register */
+       if (!devm_request_region(dev, p->smi_res->start,
+                                resource_size(p->smi_res),
+@@ -547,7 +548,13 @@ static int iTCO_wdt_probe(struct platform_device *pdev)
+       watchdog_set_drvdata(&p->wddev, p);
+       platform_set_drvdata(pdev, p);
+ 
+-      iTCO_wdt_set_running(p);
++      if (!iTCO_wdt_set_running(p)) {
++              /*
++               * If the watchdog was not running set NO_REBOOT now to
++               * prevent later reboots.
++               */
++              p->update_no_reboot_bit(p->no_reboot_priv, true);
++      }
+ 
+       /* Check that the heartbeat value is within it's range;
+          if not reset to the default */
+-- 
+2.40.1
+