summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQiuxu Zhuo <qiuxu.zhuo@intel.com>2018-10-09 10:20:25 -0700
committerBorislav Petkov <bp@suse.de>2018-10-09 19:30:04 +0200
commit8f18973877204dc8ca4ce1004a5d28683b9a7086 (patch)
treede2853f7ed855394ebae59573ee60e177a8084ff
parent432de7fd7630c84ad24f1c2acd1e3bb4ce3741ca (diff)
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
-rw-r--r--drivers/edac/skx_edac.c2
1 files changed, 1 insertions, 1 deletions
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;