From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA2FFC43441 for ; Sun, 11 Nov 2018 23:58:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9145C20839 for ; Sun, 11 Nov 2018 23:58:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="FxACpysU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9145C20839 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732678AbeKLJs3 (ORCPT ); Mon, 12 Nov 2018 04:48:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:35336 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732439AbeKLISI (ORCPT ); Mon, 12 Nov 2018 03:18:08 -0500 Received: from localhost (unknown [206.108.79.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7E12521104; Sun, 11 Nov 2018 22:28:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541975292; bh=8RyDDcbrp1K+DdDJtaRDfjac91WBF2c8MUjVKRrUhC0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FxACpysUADGqtWc95I7+S+ZIB6dSiwqYP72cDpZgWafOf7Lu+hRZWrLLkm91lzExn of7yHrIObEFEP9PkMyIRCDaDDZNsEPkWlXKwnzk0LGXPIWzrmyl/G+0PF2fMldNgJX SmeJH6LWJt60DsLlsQwuN8cb879kYuRhFMEDIpZ8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qiuxu Zhuo , Tony Luck , Borislav Petkov , Aristeu Rozanski , Mauro Carvalho Chehab , linux-edac Subject: [PATCH 4.19 236/361] EDAC, skx_edac: Fix logical channel intermediate decoding Date: Sun, 11 Nov 2018 14:19:43 -0800 Message-Id: <20181111221651.939713664@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181111221619.915519183@linuxfoundation.org> References: <20181111221619.915519183@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Qiuxu Zhuo 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 Signed-off-by: Tony Luck Signed-off-by: Borislav Petkov CC: Aristeu Rozanski CC: Mauro Carvalho Chehab CC: linux-edac Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20181009172025.18594-1-tony.luck@intel.com Signed-off-by: Greg Kroah-Hartman --- 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 @@ -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; From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [4.19,236/361] EDAC, skx_edac: Fix logical channel intermediate decoding From: Greg Kroah-Hartman Message-Id: <20181111221651.939713664@linuxfoundation.org> Date: Sun, 11 Nov 2018 14:19:43 -0800 To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qiuxu Zhuo , Tony Luck , Borislav Petkov , Aristeu Rozanski , Mauro Carvalho Chehab , linux-edac List-ID: NC4xOS1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBRaXV4dSBaaHVv IDxxaXV4dS56aHVvQGludGVsLmNvbT4KCmNvbW1pdCA4ZjE4OTczODc3MjA0ZGM4Y2E0Y2UxMDA0 YTVkMjg2ODNiOWE3MDg2IHVwc3RyZWFtLgoKVGhlIGNvZGUgImxjaGFuID0gKGxjaGFuIDw8IDEp IHwgfmxjaGFuIiBmb3IgbG9naWNhbCBjaGFubmVsCmludGVybWVkaWF0ZSBkZWNvZGluZyBpcyB3 cm9uZy4gVGhlIHdyb25nIGludGVybWVkaWF0ZSBkZWNvZGluZwpyZXN1bHQgaXMgezB4ZmZmZmZm ZmYsIDB4ZmZmZmZmZmV9LgoKRml4IGl0IGJ5IHJlcGxhY2luZyAnficgd2l0aCAnIScuIFRoZSBj b3JyZWN0IGludGVybWVkaWF0ZQpkZWNvZGluZyByZXN1bHQgaXMgezB4MSwgMHgyfS4KClNpZ25l ZC1vZmYtYnk6IFFpdXh1IFpodW8gPHFpdXh1LnpodW9AaW50ZWwuY29tPgpTaWduZWQtb2ZmLWJ5 OiBUb255IEx1Y2sgPHRvbnkubHVja0BpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6IEJvcmlzbGF2 IFBldGtvdiA8YnBAc3VzZS5kZT4KQ0M6IEFyaXN0ZXUgUm96YW5za2kgPGFyaXNAcmVkaGF0LmNv bT4KQ0M6IE1hdXJvIENhcnZhbGhvIENoZWhhYiA8bWNoZWhhYkBrZXJuZWwub3JnPgpDQzogbGlu dXgtZWRhYyA8bGludXgtZWRhY0B2Z2VyLmtlcm5lbC5vcmc+CkNjOiBzdGFibGVAdmdlci5rZXJu ZWwub3JnCkxpbms6IGh0dHA6Ly9sa21sLmtlcm5lbC5vcmcvci8yMDE4MTAwOTE3MjAyNS4xODU5 NC0xLXRvbnkubHVja0BpbnRlbC5jb20KU2lnbmVkLW9mZi1ieTogR3JlZyBLcm9haC1IYXJ0bWFu IDxncmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4KLS0tCiBkcml2ZXJzL2VkYWMvc2t4X2VkYWMu YyB8ICAgIDIgKy0KIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigt KQoKLS0tIGEvZHJpdmVycy9lZGFjL3NreF9lZGFjLmMKKysrIGIvZHJpdmVycy9lZGFjL3NreF9l ZGFjLmMKQEAgLTY2OCw3ICs2NjgsNyBAQCBzYWRfZm91bmQ6CiAJCQlicmVhazsKIAkJY2FzZSAy OgogCQkJbGNoYW4gPSAoYWRkciA+PiBzaGlmdCkgJSAyOwotCQkJbGNoYW4gPSAobGNoYW4gPDwg MSkgfCB+bGNoYW47CisJCQlsY2hhbiA9IChsY2hhbiA8PCAxKSB8ICFsY2hhbjsKIAkJCWJyZWFr OwogCQljYXNlIDM6CiAJCQlsY2hhbiA9ICgoYWRkciA+PiBzaGlmdCkgJSAyKSA8PCAxOwo=