4.4-stable patches

added patches:
	edac-synopsys-fix-wrong-value-type-assignment-for-edac_mode.patch

diff --git a/queue-4.4/edac-synopsys-fix-wrong-value-type-assignment-for-edac_mode.patch b/queue-4.4/edac-synopsys-fix-wrong-value-type-assignment-for-edac_mode.patch
new file mode 100644 (file)
index 0000000..02daa00
--- /dev/null
+++ b/queue-4.4/edac-synopsys-fix-wrong-value-type-assignment-for-edac_mode.patch
@@ -0,0 +1,40 @@
+From 5297cfa6bdf93e3889f78f9b482e2a595a376083 Mon Sep 17 00:00:00 2001
+From: Sai Krishna Potthuri <lakshmi.sai.krishna.potthuri@xilinx.com>
+Date: Wed, 18 Aug 2021 12:53:14 +0530
+Subject: EDAC/synopsys: Fix wrong value type assignment for edac_mode
+
+From: Sai Krishna Potthuri <lakshmi.sai.krishna.potthuri@xilinx.com>
+
+commit 5297cfa6bdf93e3889f78f9b482e2a595a376083 upstream.
+
+dimm->edac_mode contains values of type enum edac_type - not the
+corresponding capability flags. Fix that.
+
+Issue caught by Coverity check "enumerated type mixed with another
+type."
+
+ [ bp: Rewrite commit message, add tags. ]
+
+Fixes: ae9b56e3996d ("EDAC, synps: Add EDAC support for zynq ddr ecc controller")
+Signed-off-by: Sai Krishna Potthuri <lakshmi.sai.krishna.potthuri@xilinx.com>
+Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
+Signed-off-by: Borislav Petkov <bp@suse.de>
+Cc: <stable@vger.kernel.org>
+Link: https://lkml.kernel.org/r/20210818072315.15149-1-shubhrajyoti.datta@xilinx.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/edac/synopsys_edac.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/edac/synopsys_edac.c
++++ b/drivers/edac/synopsys_edac.c
+@@ -371,7 +371,7 @@ static int synps_edac_init_csrows(struct
+ 
+               for (j = 0; j < csi->nr_channels; j++) {
+                       dimm            = csi->channels[j]->dimm;
+-                      dimm->edac_mode = EDAC_FLAG_SECDED;
++                      dimm->edac_mode = EDAC_SECDED;
+                       dimm->mtype     = synps_edac_get_mtype(priv->baseaddr);
+                       dimm->nr_pages  = (size >> PAGE_SHIFT) / csi->nr_channels;
+                       dimm->grain     = SYNPS_EDAC_ERR_GRAIN;

diff --git a/queue-4.4/series b/queue-4.4/series
index 85f24b17ad2ecb9d397e1d77b4cc07849c110f93..1da7ebc533d4ec4ddea3021463974185c25014ac 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -33,3 +33,4 @@ ipack-ipoctal-fix-tty-registration-error-handling.patch
 ipack-ipoctal-fix-missing-allocation-failure-check.patch
 ipack-ipoctal-fix-module-reference-leak.patch
 ext4-fix-potential-infinite-loop-in-ext4_dx_readdir.patch
+edac-synopsys-fix-wrong-value-type-assignment-for-edac_mode.patch