5.4-stable patches

added patches:
	ipmi-watchdog-replace-atomic_add-and-atomic_sub.patch
	ipmi-watchdog-set-panic-count-to-proper-value-on-a-panic.patch

diff --git a/queue-5.4/ipmi-watchdog-replace-atomic_add-and-atomic_sub.patch b/queue-5.4/ipmi-watchdog-replace-atomic_add-and-atomic_sub.patch
new file mode 100644 (file)
index 0000000..ecbbfe9
--- /dev/null
+++ b/queue-5.4/ipmi-watchdog-replace-atomic_add-and-atomic_sub.patch
@@ -0,0 +1,54 @@
+From a01a89b1db1066a6af23ae08b9a0c345b7966f0b Mon Sep 17 00:00:00 2001
+From: Yejune Deng <yejune.deng@gmail.com>
+Date: Mon, 16 Nov 2020 15:30:07 +0800
+Subject: ipmi/watchdog: replace atomic_add() and atomic_sub()
+
+From: Yejune Deng <yejune.deng@gmail.com>
+
+commit a01a89b1db1066a6af23ae08b9a0c345b7966f0b upstream.
+
+atomic_inc() and atomic_dec() looks better
+
+Signed-off-by: Yejune Deng <yejune.deng@gmail.com>
+Message-Id: <1605511807-7135-1-git-send-email-yejune.deng@gmail.com>
+Signed-off-by: Corey Minyard <cminyard@mvista.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/char/ipmi/ipmi_watchdog.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/char/ipmi/ipmi_watchdog.c
++++ b/drivers/char/ipmi/ipmi_watchdog.c
+@@ -498,7 +498,7 @@ static void panic_halt_ipmi_heartbeat(vo
+       msg.cmd = IPMI_WDOG_RESET_TIMER;
+       msg.data = NULL;
+       msg.data_len = 0;
+-      atomic_add(1, &panic_done_count);
++      atomic_inc(&panic_done_count);
+       rv = ipmi_request_supply_msgs(watchdog_user,
+                                     (struct ipmi_addr *) &addr,
+                                     0,
+@@ -508,7 +508,7 @@ static void panic_halt_ipmi_heartbeat(vo
+                                     &panic_halt_heartbeat_recv_msg,
+                                     1);
+       if (rv)
+-              atomic_sub(1, &panic_done_count);
++              atomic_dec(&panic_done_count);
+ }
+ 
+ static struct ipmi_smi_msg panic_halt_smi_msg = {
+@@ -532,12 +532,12 @@ static void panic_halt_ipmi_set_timeout(
+       /* Wait for the messages to be free. */
+       while (atomic_read(&panic_done_count) != 0)
+               ipmi_poll_interface(watchdog_user);
+-      atomic_add(1, &panic_done_count);
++      atomic_inc(&panic_done_count);
+       rv = __ipmi_set_timeout(&panic_halt_smi_msg,
+                               &panic_halt_recv_msg,
+                               &send_heartbeat_now);
+       if (rv) {
+-              atomic_sub(1, &panic_done_count);
++              atomic_dec(&panic_done_count);
+               pr_warn("Unable to extend the watchdog timeout\n");
+       } else {
+               if (send_heartbeat_now)

diff --git a/queue-5.4/ipmi-watchdog-set-panic-count-to-proper-value-on-a-panic.patch b/queue-5.4/ipmi-watchdog-set-panic-count-to-proper-value-on-a-panic.patch
new file mode 100644 (file)
index 0000000..468d365
--- /dev/null
+++ b/queue-5.4/ipmi-watchdog-set-panic-count-to-proper-value-on-a-panic.patch
@@ -0,0 +1,58 @@
+From db05ddf7f321634c5659a0cf7ea56594e22365f7 Mon Sep 17 00:00:00 2001
+From: Corey Minyard <cminyard@mvista.com>
+Date: Mon, 20 Sep 2021 06:25:37 -0500
+Subject: ipmi:watchdog: Set panic count to proper value on a panic
+
+From: Corey Minyard <cminyard@mvista.com>
+
+commit db05ddf7f321634c5659a0cf7ea56594e22365f7 upstream.
+
+You will get two decrements when the messages on a panic are sent, not
+one, since commit 2033f6858970 ("ipmi: Free receive messages when in an
+oops") was added, but the watchdog code had a bug where it didn't set
+the value properly.
+
+Reported-by: Anton Lundin <glance@acc.umu.se>
+Cc: <Stable@vger.kernel.org> # v5.4+
+Fixes: 2033f6858970 ("ipmi: Free receive messages when in an oops")
+Signed-off-by: Corey Minyard <cminyard@mvista.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/char/ipmi/ipmi_watchdog.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/char/ipmi/ipmi_watchdog.c
++++ b/drivers/char/ipmi/ipmi_watchdog.c
+@@ -498,7 +498,7 @@ static void panic_halt_ipmi_heartbeat(vo
+       msg.cmd = IPMI_WDOG_RESET_TIMER;
+       msg.data = NULL;
+       msg.data_len = 0;
+-      atomic_inc(&panic_done_count);
++      atomic_add(2, &panic_done_count);
+       rv = ipmi_request_supply_msgs(watchdog_user,
+                                     (struct ipmi_addr *) &addr,
+                                     0,
+@@ -508,7 +508,7 @@ static void panic_halt_ipmi_heartbeat(vo
+                                     &panic_halt_heartbeat_recv_msg,
+                                     1);
+       if (rv)
+-              atomic_dec(&panic_done_count);
++              atomic_sub(2, &panic_done_count);
+ }
+ 
+ static struct ipmi_smi_msg panic_halt_smi_msg = {
+@@ -532,12 +532,12 @@ static void panic_halt_ipmi_set_timeout(
+       /* Wait for the messages to be free. */
+       while (atomic_read(&panic_done_count) != 0)
+               ipmi_poll_interface(watchdog_user);
+-      atomic_inc(&panic_done_count);
++      atomic_add(2, &panic_done_count);
+       rv = __ipmi_set_timeout(&panic_halt_smi_msg,
+                               &panic_halt_recv_msg,
+                               &send_heartbeat_now);
+       if (rv) {
+-              atomic_dec(&panic_done_count);
++              atomic_sub(2, &panic_done_count);
+               pr_warn("Unable to extend the watchdog timeout\n");
+       } else {
+               if (send_heartbeat_now)

diff --git a/queue-5.4/series b/queue-5.4/series
index 0206eb90f17f00b385f1ba928bbb0710274165ea..8d6f8c5b03a0e1e4eac04bf17110834f7d665a06 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -66,3 +66,5 @@ macintosh-windfarm-use-unsigned-type-for-1-bit-bitfi.patch
 pci-add-solidrun-vendor-id.patch
 pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
 media-ov5640-fix-analogue-gain-control.patch
+ipmi-watchdog-replace-atomic_add-and-atomic_sub.patch
+ipmi-watchdog-set-panic-count-to-proper-value-on-a-panic.patch