Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3476291imu; Sun, 11 Nov 2018 15:59:53 -0800 (PST) X-Google-Smtp-Source: AJdET5ewbVwtLT28ggMWAbD/7ECYvQzAEjLpfMi2wjs30x8j0E5NaUPzKRz2AFAGmPw1iHMpEbRA X-Received: by 2002:a17:902:703:: with SMTP id 3-v6mr17985954pli.38.1541980793004; Sun, 11 Nov 2018 15:59:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541980792; cv=none; d=google.com; s=arc-20160816; b=yBU/BQAz+538h5dSIme6FzQD0XOM4UiFjSHYmgvDpXCK0Rk88q6oBjBaTEdgNxAqFu rULXTbvmTAL7F8Sm211RcE6qzGIp9Xtl56wQ/dcE3E2VS+BSj+HEGrMFtyeMTNYo7g1L rA0SF8KDFy1zIbLwp5ZiG4tefpAFg7s7Oe25A0DtDLZm6LCcl8rUBph54tsdbAUMoR3k 4XdBMqVkSoEgynjMmdBMDIsdZuSEb/0Mh5G/YIWtPXDFFugdEpqhxMQJamioP0xwtDLu Xye86WvWuVPemVVxWoOVOL6V4e3nmDb8ptHyHUP8Yhtzc0t9zqZO2EtQGv5EI9sQU9c+ uTAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=E4XN+LoKqJVHPiPF6auOUlNbUB+Kig8S19NJzMEj2oc=; b=0uIZJYVV0v7PMm4UShd5Rqua9eThXW2ZEKJjjcVwrHwo9Ol+F9FAUu9mKSen/UY/y3 lbFA/E1Qnok32/uSS2rUxuPhNRDtgf2FIRWeSSGeVG5bMDUzdqol5a+pXzZWDP2FYpGQ PEUOgCRPfqPAzS65qQ36sEl3vESoKHmbZvZwn1ssdS14vxLqL4Ethoko6pJNFmJl5CUC oYkg6XbIk7pO2u0oX4vRcg+K7s0OlrJ/IpqeU77MYN+mlAZ0bhpKcIoUbMZuh8orj4VK /SPqfD7INL7LGE3IttJ/oRGpoXp4dDcrSwI3Qs+UzqrAxFGhQSjE2xWwjMAtbM/RgQxU OzFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=FxACpysU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 129-v6si17322620pfy.164.2018.11.11.15.59.38; Sun, 11 Nov 2018 15:59:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=FxACpysU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732663AbeKLJs3 (ORCPT + 99 others); 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;