From: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
Date: Tue, 9 Oct 2018 17:20:25 +0000 (-0700)
Subject: EDAC, skx_edac: Fix logical channel intermediate decoding
X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~6088^2~2
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=8f18973877204dc8ca4ce1004a5d28683b9a7086;p=linux.git

EDAC, skx_edac: Fix logical channel intermediate decoding

The code "lchan = (lchan << 1) | ~lchan" for logical channel
intermediate decoding is wrong. The wrong intermediate decoding
result is {0xffffffff, 0xfffffffe}.

Fix it by replacing '~' with '!'. The correct intermediate
decoding result is {0x1, 0x2}.

Signed-off-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
CC: Aristeu Rozanski <aris@redhat.com>
CC: Mauro Carvalho Chehab <mchehab@kernel.org>
CC: linux-edac <linux-edac@vger.kernel.org>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/20181009172025.18594-1-tony.luck@intel.com
---

diff --git a/drivers/edac/skx_edac.c b/drivers/edac/skx_edac.c
index e840412abe4e..dd209e0dd9ab 100644
--- a/drivers/edac/skx_edac.c
+++ b/drivers/edac/skx_edac.c
@@ -668,7 +668,7 @@ sad_found:
 			break;
 		case 2:
 			lchan = (addr >> shift) % 2;
-			lchan = (lchan << 1) | ~lchan;
+			lchan = (lchan << 1) | !lchan;
 			break;
 		case 3:
 			lchan = ((addr >> shift) % 2) << 1;