From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 6 Aug 2021 06:30:52 +0000 (+0200)
Subject: 5.13-stable patches
X-Git-Tag: v4.4.279~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6d01aab825fe14c3c19abbd653924e9ded33032;p=thirdparty%2Fkernel%2Fstable-queue.git

5.13-stable patches

added patches:
	revert-watchdog-itco_wdt-account-for-rebooting-on-second-timeout.patch
---

diff --git a/queue-5.13/revert-watchdog-itco_wdt-account-for-rebooting-on-second-timeout.patch b/queue-5.13/revert-watchdog-itco_wdt-account-for-rebooting-on-second-timeout.patch
new file mode 100644
index 00000000000..0ab307d705d
--- /dev/null
+++ b/queue-5.13/revert-watchdog-itco_wdt-account-for-rebooting-on-second-timeout.patch
@@ -0,0 +1,60 @@
+From b173962fd25a6a3ddf10771bdd6d9697bff2d21f Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Fri, 6 Aug 2021 08:28:48 +0200
+Subject: Revert "watchdog: iTCO_wdt: Account for rebooting on second timeout"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 5e65819a006ec8a8df2f8639dc26ef0cfaa95ae7 which is
+commit cb011044e34c293e139570ce5c01aed66a34345c upstream.
+
+It is reported to cause problems with systems and probably should not
+have been backported in the first place :(
+
+Link: https://lore.kernel.org/r/20210803165108.4154cd52@endymion
+Reported-by: Jean Delvare <jdelvare@suse.de>
+Cc: Jan Kiszka <jan.kiszka@siemens.com>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Cc: Wim Van Sebroeck <wim@linux-watchdog.org>
+Cc: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/watchdog/iTCO_wdt.c |   12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+--- a/drivers/watchdog/iTCO_wdt.c
++++ b/drivers/watchdog/iTCO_wdt.c
+@@ -71,8 +71,6 @@
+ #define TCOBASE(p)	((p)->tco_res->start)
+ /* SMI Control and Enable Register */
+ #define SMI_EN(p)	((p)->smi_res->start)
+-#define TCO_EN		(1 << 13)
+-#define GBL_SMI_EN	(1 << 0)
+ 
+ #define TCO_RLD(p)	(TCOBASE(p) + 0x00) /* TCO Timer Reload/Curr. Value */
+ #define TCOv1_TMR(p)	(TCOBASE(p) + 0x01) /* TCOv1 Timer Initial Value*/
+@@ -357,12 +355,8 @@ static int iTCO_wdt_set_timeout(struct w
+ 
+ 	tmrval = seconds_to_ticks(p, t);
+ 
+-	/*
+-	 * If TCO SMIs are off, the timer counts down twice before rebooting.
+-	 * Otherwise, the BIOS generally reboots when the SMI triggers.
+-	 */
+-	if (p->smi_res &&
+-	    (SMI_EN(p) & (TCO_EN | GBL_SMI_EN)) != (TCO_EN | GBL_SMI_EN))
++	/* For TCO v1 the timer counts down twice before rebooting */
++	if (p->iTCO_version == 1)
+ 		tmrval /= 2;
+ 
+ 	/* from the specs: */
+@@ -527,7 +521,7 @@ static int iTCO_wdt_probe(struct platfor
+ 		 * Disables TCO logic generating an SMI#
+ 		 */
+ 		val32 = inl(SMI_EN(p));
+-		val32 &= ~TCO_EN;	/* Turn off SMI clearing watchdog */
++		val32 &= 0xffffdfff;	/* Turn off SMI clearing watchdog */
+ 		outl(val32, SMI_EN(p));
+ 	}
+ 
diff --git a/queue-5.13/series b/queue-5.13/series
index a58bed914ba..a027cfa7fd4 100644
--- a/queue-5.13/series
+++ b/queue-5.13/series
@@ -31,3 +31,4 @@ io_uring-never-attempt-iopoll-reissue-from-release-p.patch
 io_uring-explicitly-catch-any-illegal-async-queue-at.patch
 revert-spi-mediatek-fix-fifo-rx-mode.patch
 revert-bluetooth-shutdown-controller-after-workqueues-are-flushed-or-cancelled.patch
+revert-watchdog-itco_wdt-account-for-rebooting-on-second-timeout.patch