From patchwork Thu Oct 3 15:50:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 175147 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp573351ill; Thu, 3 Oct 2019 09:43:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqwLkMfWtgIpHWI2iSfKMomkzWGHq7W5R46NnvVyqxQyun03eZO7KyymD9/oOzn27AyCbzeh X-Received: by 2002:a17:906:244a:: with SMTP id a10mr8559955ejb.137.1570120981566; Thu, 03 Oct 2019 09:43:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570120981; cv=none; d=google.com; s=arc-20160816; b=MomsZyNfY7SbAHodyDNjtwc3TT1OwBJvDeLOlgRx29ZSvyLVl3jvTXi1csNzmlGPYm VSlI9mCKgTOr5eUbh9ezdPqWYchtE/U78X35uUtVi5VHOvjA7lXjvncKeWxEcolMxxRJ nDOzUTXTzFnQx3TYY32PiZMuJmNEvQQQD7XZF/RtQFlSLKtR4rXIRlZ7iW3XqoD9Xd21 l2nucTE3IKEFa70E1aKuK1yZenTmOIkg5FQk+Jh71O5rPObcjZFJFWz9lTSm6ZSlojo6 B+BtGsqFspcghUJegixQhrmN6lReyzmJKnhK85FrEvblYaHl6KkCAi0HUqWGknfU/NKX UqfQ== 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=zV6NLSZp31BqJog2/3djubuHBBwyDCWf+zdP/R/Ab8M=; b=Mf1kyx5L2kWeoBqfaX+v8V5yDS+CAf4eW+aL18O3GQIJlng0jFd+zv/Qp3cn6CqaUU AXmAWY64HxFCMwTcu6KHnQ+/j8Hru5H/Za6WsG/McH6LDYVj4AGXmkKsnTIp549HGelh 4+eT3bCCzWaWGggC+kyfx2QBbXRhfqc1mFgL9NDD4m7gzW+UhE/V1LTdw0QlFEMcDUtZ lWOFbyLlVeDN03mJIaERLci6bocapU/Y+CaoRVbB404/gezWWyU2+3R3XIpGsS4C4FDl 8dvRZ8ZD0dD7spl3yrA9APRmkqVU3FFdDSNsSMct7CtHYyopVspdhuc9rcP/PwsjUYm3 ejnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hUC2Lde2; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 k17si1562556ejz.227.2019.10.03.09.43.01; Thu, 03 Oct 2019 09:43:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=hUC2Lde2; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392696AbfJCQnA (ORCPT + 14 others); Thu, 3 Oct 2019 12:43:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:54216 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405131AbfJCQm6 (ORCPT ); Thu, 3 Oct 2019 12:42:58 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 80EFC206BB; Thu, 3 Oct 2019 16:42:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570120977; bh=5+4+EyeHu/Ui4dWZQbgh+L+4DfByRKwtCBXnWaSYN9Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hUC2Lde2urY667cK7p0sCULAvsUvRe3WD9YzSxwYfQptoOJbzvEYv5exJrkIfML2R Gtc96NTwhu0uiFzhPPhypgQ/1iQWGuh9L/PHBRCRbDOu1p6c5iv4TQi72F+TZc4fF7 BbDfMXZ6wasHjG6QYyPhpGVhb+c67lQLD1HNZ3Eo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Robert Richter , Borislav Petkov , "linux-edac@vger.kernel.org" , James Morse , Mauro Carvalho Chehab , Tony Luck , Sasha Levin Subject: [PATCH 5.3 072/344] EDAC/mc: Fix grain_bits calculation Date: Thu, 3 Oct 2019 17:50:37 +0200 Message-Id: <20191003154547.235446511@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154540.062170222@linuxfoundation.org> References: <20191003154540.062170222@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Robert Richter [ Upstream commit 3724ace582d9f675134985727fd5e9811f23c059 ] The grain in EDAC is defined as "minimum granularity for an error report, in bytes". The following calculation of the grain_bits in edac_mc is wrong: grain_bits = fls_long(e->grain) + 1; Where grain_bits is defined as: grain = 1 << grain_bits Example: grain = 8 # 64 bit (8 bytes) grain_bits = fls_long(8) + 1 grain_bits = 4 + 1 = 5 grain = 1 << grain_bits grain = 1 << 5 = 32 Replace it with the correct calculation: grain_bits = fls_long(e->grain - 1); The example gives now: grain_bits = fls_long(8 - 1) grain_bits = fls_long(7) grain_bits = 3 grain = 1 << 3 = 8 Also, check if the hardware reports a reasonable grain != 0 and fallback with a warning to 1 byte granularity otherwise. [ bp: massage a bit. ] Signed-off-by: Robert Richter Signed-off-by: Borislav Petkov Cc: "linux-edac@vger.kernel.org" Cc: James Morse Cc: Mauro Carvalho Chehab Cc: Tony Luck Link: https://lkml.kernel.org/r/20190624150758.6695-2-rrichter@marvell.com Signed-off-by: Sasha Levin --- drivers/edac/edac_mc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 64922c8fa7e3b..d899d86897d06 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c @@ -1235,9 +1235,13 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type, if (p > e->location) *(p - 1) = '\0'; - /* Report the error via the trace interface */ - grain_bits = fls_long(e->grain) + 1; + /* Sanity-check driver-supplied grain value. */ + if (WARN_ON_ONCE(!e->grain)) + e->grain = 1; + + grain_bits = fls_long(e->grain - 1); + /* Report the error via the trace interface */ if (IS_ENABLED(CONFIG_RAS)) trace_mc_event(type, e->msg, e->label, e->error_count, mci->mc_idx, e->top_layer, e->mid_layer,