| From 8f18973877204dc8ca4ce1004a5d28683b9a7086 Mon Sep 17 00:00:00 2001 |
| From: Qiuxu Zhuo <qiuxu.zhuo@intel.com> |
| Date: Tue, 9 Oct 2018 10:20:25 -0700 |
| Subject: EDAC, skx_edac: Fix logical channel intermediate decoding |
| |
| From: Qiuxu Zhuo <qiuxu.zhuo@intel.com> |
| |
| commit 8f18973877204dc8ca4ce1004a5d28683b9a7086 upstream. |
| |
| 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 |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/edac/skx_edac.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/edac/skx_edac.c |
| +++ b/drivers/edac/skx_edac.c |
| @@ -606,7 +606,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; |
