From: Sasha Levin <sashal@kernel.org>
Date: Fri, 6 Mar 2020 14:20:53 +0000 (-0500)
Subject: fixes for 4.19
X-Git-Tag: v4.4.216~69
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82828c7eeb6e6f3c3995be28dd7c0b2a942a59c4;p=thirdparty%2Fkernel%2Fstable-queue.git

fixes for 4.19

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

diff --git a/queue-4.19/edac-amd64-set-grain-per-dimm.patch b/queue-4.19/edac-amd64-set-grain-per-dimm.patch
new file mode 100644
index 00000000000..c6fc92447d1
--- /dev/null
+++ b/queue-4.19/edac-amd64-set-grain-per-dimm.patch
@@ -0,0 +1,49 @@
+From b86d70e1aeaabfb3d54da1c49ee2ccecd34443fc Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 5 Mar 2020 17:30:07 +0100
+Subject: EDAC/amd64: Set grain per DIMM
+
+From: Yazen Ghannam <yazen.ghannam@amd.com>
+
+[ Upstream commit 466503d6b1b33be46ab87c6090f0ade6c6011cbc ]
+
+The following commit introduced a warning on error reports without a
+non-zero grain value.
+
+  3724ace582d9 ("EDAC/mc: Fix grain_bits calculation")
+
+The amd64_edac_mod module does not provide a value, so the warning will
+be given on the first reported memory error.
+
+Set the grain per DIMM to cacheline size (64 bytes). This is the current
+recommendation.
+
+Fixes: 3724ace582d9 ("EDAC/mc: Fix grain_bits calculation")
+Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
+Signed-off-by: Borislav Petkov <bp@suse.de>
+Cc: "linux-edac@vger.kernel.org" <linux-edac@vger.kernel.org>
+Cc: James Morse <james.morse@arm.com>
+Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
+Cc: Robert Richter <rrichter@marvell.com>
+Cc: Tony Luck <tony.luck@intel.com>
+Link: https://lkml.kernel.org/r/20191022203448.13962-7-Yazen.Ghannam@amd.com
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/edac/amd64_edac.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
+index 94265e4385146..05d6f9c86ac38 100644
+--- a/drivers/edac/amd64_edac.c
++++ b/drivers/edac/amd64_edac.c
+@@ -2863,6 +2863,7 @@ static int init_csrows(struct mem_ctl_info *mci)
+ 			dimm = csrow->channels[j]->dimm;
+ 			dimm->mtype = pvt->dram_type;
+ 			dimm->edac_mode = edac_mode;
++			dimm->grain = 64;
+ 		}
+ 	}
+ 
+-- 
+2.20.1
+
diff --git a/queue-4.19/series b/queue-4.19/series
new file mode 100644
index 00000000000..9eccaae0a9d
--- /dev/null
+++ b/queue-4.19/series
@@ -0,0 +1 @@
+edac-amd64-set-grain-per-dimm.patch