Home Home > GIT Browse > SLE12-SP3-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-05-17 07:00:16 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-05-17 07:00:16 +0200
commit66046cd1642b490ab06a591c99d07a33de058a05 (patch)
treee925a01ef4a7f7029496a3140330576dc9001c40
parent00c9afeda2661e38960a75f3322273380924bfa3 (diff)
parentcccd8a9116ad3a524fa6a49f332779c317eb5e0a (diff)
Merge branch 'SLE12-SP3' into SLE12-SP3-AZURE
-rw-r--r--patches.fixes/ipmi-ssif-compare-block-number-correctly-for-multi-p.patch55
-rw-r--r--series.conf1
2 files changed, 56 insertions, 0 deletions
diff --git a/patches.fixes/ipmi-ssif-compare-block-number-correctly-for-multi-p.patch b/patches.fixes/ipmi-ssif-compare-block-number-correctly-for-multi-p.patch
new file mode 100644
index 0000000000..bac1c214ab
--- /dev/null
+++ b/patches.fixes/ipmi-ssif-compare-block-number-correctly-for-multi-p.patch
@@ -0,0 +1,55 @@
+From 55be8658c7e2feb11a5b5b33ee031791dbd23a69 Mon Sep 17 00:00:00 2001
+From: Kamlakant Patel <kamlakantp@marvell.com>
+Date: Wed, 24 Apr 2019 11:50:43 +0000
+Subject: [PATCH] ipmi:ssif: compare block number correctly for multi-part return messages
+Git-commit: 55be8658c7e2feb11a5b5b33ee031791dbd23a69
+Patch-mainline: v5.2-rc1
+References: bsc#1135120
+
+According to ipmi spec, block number is a number that is incremented,
+starting with 0, for each new block of message data returned using the
+middle transaction.
+
+Here, the 'blocknum' is data[0] which always starts from zero(0) and
+'ssif_info->multi_pos' starts from 1.
+So, we need to add +1 to blocknum while comparing with multi_pos.
+
+Fixes: 7d6380cd40f79 ("ipmi:ssif: Fix handling of multi-part return messages").
+Reported-by: Kiran Kolukuluru <kirank@ami.com>
+Signed-off-by: Kamlakant Patel <kamlakantp@marvell.com>
+Message-id: <1556106615-18722-1-git-send-email-kamlakantp@marvell.com>
+[Also added a debug log if the block numbers don't match.]
+
+Signed-off-by: Corey Minyard <cminyard@mvista.com>
+Cc: stable@vger.kernel.org # 4.4
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/char/ipmi/ipmi_ssif.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c
+index 8b5aec5430f1..aaccb0ff1ea6 100644
+--- a/drivers/char/ipmi/ipmi_ssif.c
++++ b/drivers/char/ipmi/ipmi_ssif.c
+@@ -727,12 +727,16 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result,
+ /* End of read */
+ len = ssif_info->multi_len;
+ data = ssif_info->data;
+- } else if (blocknum != ssif_info->multi_pos) {
++ } else if (blocknum + 1 != ssif_info->multi_pos) {
+ /*
+ * Out of sequence block, just abort. Block
+ * numbers start at zero for the second block,
+ * but multi_pos starts at one, so the +1.
+ */
++ if (ssif_info->ssif_debug & SSIF_DEBUG_MSG)
++ dev_dbg(&ssif_info->client->dev,
++ "Received message out of sequence, expected %u, got %u\n",
++ ssif_info->multi_pos - 1, blocknum);
+ result = -EIO;
+ } else {
+ ssif_inc_stat(ssif_info, received_message_parts);
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index d651c91f5d..345d2d5315 100644
--- a/series.conf
+++ b/series.conf
@@ -25490,6 +25490,7 @@
patches.drivers/ibmvnic-Report-actual-backing-device-speed-and-duple.patch
patches.drivers/Bluetooth-hidp-fix-buffer-overflow.patch
patches.fixes/0001-UAS-fix-alignment-of-scatter-gather-segments.patch
+ patches.fixes/ipmi-ssif-compare-block-number-correctly-for-multi-p.patch
patches.fixes/0001-drm-i915-Fix-I915_EXEC_RING_MASK.patch
patches.fixes/0002-drm-fb-helper-dpms_legacy-Only-set-on-connectors-in-.patch
patches.arch/powerpc-numa-improve-control-of-topology-updates.patch