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.9,093/141] EDAC, skx_edac: Fix logical channel intermediate decoding From: Greg Kroah-Hartman Message-Id: <20181111221640.980038100@linuxfoundation.org> Date: Sun, 11 Nov 2018 14:25:52 -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: NC45LXN0YWJsZSByZXZpZXcgcGF0Y2guICBJZiBhbnlvbmUgaGFzIGFueSBvYmplY3Rpb25zLCBw bGVhc2UgbGV0IG1lIGtub3cuCgotLS0tLS0tLS0tLS0tLS0tLS0KCkZyb206IFFpdXh1IFpodW8g PHFpdXh1LnpodW9AaW50ZWwuY29tPgoKY29tbWl0IDhmMTg5NzM4NzcyMDRkYzhjYTRjZTEwMDRh NWQyODY4M2I5YTcwODYgdXBzdHJlYW0uCgpUaGUgY29kZSAibGNoYW4gPSAobGNoYW4gPDwgMSkg fCB+bGNoYW4iIGZvciBsb2dpY2FsIGNoYW5uZWwKaW50ZXJtZWRpYXRlIGRlY29kaW5nIGlzIHdy b25nLiBUaGUgd3JvbmcgaW50ZXJtZWRpYXRlIGRlY29kaW5nCnJlc3VsdCBpcyB7MHhmZmZmZmZm ZiwgMHhmZmZmZmZmZX0uCgpGaXggaXQgYnkgcmVwbGFjaW5nICd+JyB3aXRoICchJy4gVGhlIGNv cnJlY3QgaW50ZXJtZWRpYXRlCmRlY29kaW5nIHJlc3VsdCBpcyB7MHgxLCAweDJ9LgoKU2lnbmVk LW9mZi1ieTogUWl1eHUgWmh1byA8cWl1eHUuemh1b0BpbnRlbC5jb20+ClNpZ25lZC1vZmYtYnk6 IFRvbnkgTHVjayA8dG9ueS5sdWNrQGludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogQm9yaXNsYXYg UGV0a292IDxicEBzdXNlLmRlPgpDQzogQXJpc3RldSBSb3phbnNraSA8YXJpc0ByZWRoYXQuY29t PgpDQzogTWF1cm8gQ2FydmFsaG8gQ2hlaGFiIDxtY2hlaGFiQGtlcm5lbC5vcmc+CkNDOiBsaW51 eC1lZGFjIDxsaW51eC1lZGFjQHZnZXIua2VybmVsLm9yZz4KQ2M6IHN0YWJsZUB2Z2VyLmtlcm5l bC5vcmcKTGluazogaHR0cDovL2xrbWwua2VybmVsLm9yZy9yLzIwMTgxMDA5MTcyMDI1LjE4NTk0 LTEtdG9ueS5sdWNrQGludGVsLmNvbQpTaWduZWQtb2ZmLWJ5OiBHcmVnIEtyb2FoLUhhcnRtYW4g PGdyZWdraEBsaW51eGZvdW5kYXRpb24ub3JnPgotLS0KIGRyaXZlcnMvZWRhYy9za3hfZWRhYy5j IHwgICAgMiArLQogMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0p CgotLS0gYS9kcml2ZXJzL2VkYWMvc2t4X2VkYWMuYworKysgYi9kcml2ZXJzL2VkYWMvc2t4X2Vk YWMuYwpAQCAtNjA2LDcgKzYwNiw3IEBAIHNhZF9mb3VuZDoKIAkJCWJyZWFrOwogCQljYXNlIDI6 CiAJCQlsY2hhbiA9IChhZGRyID4+IHNoaWZ0KSAlIDI7Ci0JCQlsY2hhbiA9IChsY2hhbiA8PCAx KSB8IH5sY2hhbjsKKwkJCWxjaGFuID0gKGxjaGFuIDw8IDEpIHwgIWxjaGFuOwogCQkJYnJlYWs7 CiAJCWNhc2UgMzoKIAkJCWxjaGFuID0gKChhZGRyID4+IHNoaWZ0KSAlIDIpIDw8IDE7Cg== 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,URIBL_BLOCKED,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 05AEAC43441 for ; Sun, 11 Nov 2018 22:34:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C2EF021582 for ; Sun, 11 Nov 2018 22:34:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="WyUA22eO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C2EF021582 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 S2404821AbeKLIYt (ORCPT ); Mon, 12 Nov 2018 03:24:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:60436 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731232AbeKLIYs (ORCPT ); Mon, 12 Nov 2018 03:24:48 -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 131DE21582; Sun, 11 Nov 2018 22:34:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541975690; bh=WoqFtV62gsD+RnfJuelnS5y0Knl00lrTSYwTRR0Z3QM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WyUA22eOSJVDtY+XgqkKA6BCZX7Uoj5VV16+WhmEoA1G4VVCHv7n8zjOD2t1bl3Gh LP4KctQco4rjQxoEnfrEX3qEDObiNQgBm1NC4WEvzqXiJrdJSq6w1ADvQdTe2OyxF3 mSZtQRXN/1M/YUcjMj8Nk7Lkzm8WA4qC4sBftA1k= 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.9 093/141] EDAC, skx_edac: Fix logical channel intermediate decoding Date: Sun, 11 Nov 2018 14:25:52 -0800 Message-Id: <20181111221640.980038100@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181111221627.853046496@linuxfoundation.org> References: <20181111221627.853046496@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.9-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 @@ -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;