From patchwork Tue Mar 10 12:41:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 11429301 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2EE7E139A for ; Tue, 10 Mar 2020 13:19:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0FAA1208E4 for ; Tue, 10 Mar 2020 13:19:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583846392; bh=BKC9Ui6VpGUgCihPifNb77Jm0CpEQJx00HBPT0gcfLI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=g8PXrWKbmDu6Rjg7P0hmrP/x6styGPnYl4lagTTbk+JWwBtKH1sqOZYV7e6Wb1mlg Vb+g9svSlh6CuvNbZYxtPh8iq97K2vReclpnRNrcKfV2eVo5dxo94avlgnfeTn1ONx QIwYNLIp7Mnv9WTgH87qF2bM0mXyRc5oZpgiiYcQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729415AbgCJNIU (ORCPT ); Tue, 10 Mar 2020 09:08:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:54684 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731096AbgCJNIT (ORCPT ); Tue, 10 Mar 2020 09:08:19 -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 11D2A24692; Tue, 10 Mar 2020 13:08:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583845698; bh=BKC9Ui6VpGUgCihPifNb77Jm0CpEQJx00HBPT0gcfLI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v8HbFfd+jEmucIHgb1nR43zmMgC2Wq6GRXTYLATrLJ0HEmF8PvlTNSPf2XD9Rp811 Ip/ddlVbzaMT/mEZG0nh9HTAlzPHw+8ED/wnqub+h9Sm+rQtjS7h6u6w/hCKKqmSiH C8RapeF/5VgFD++CqtqB8pbos1/pbTz1rom3DgW0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yazen Ghannam , Borislav Petkov , "linux-edac@vger.kernel.org" , James Morse , Mauro Carvalho Chehab , Robert Richter , Tony Luck , Jack Wang , Sasha Levin Subject: [PATCH 4.14 069/126] EDAC/amd64: Set grain per DIMM Date: Tue, 10 Mar 2020 13:41:30 +0100 Message-Id: <20200310124208.448589666@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200310124203.704193207@linuxfoundation.org> References: <20200310124203.704193207@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-edac-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-edac@vger.kernel.org From: Yazen Ghannam [ Upstream commit 466503d6b1b33be46ab87c6090f0ade6c6011cbc ] The following commit introduced a warning on error reports without a non-zero grain value. 3724ace582d9 ("EDAC/mc: Fix grain_bits calculation") The amd64_edac_mod module does not provide a value, so the warning will be given on the first reported memory error. Set the grain per DIMM to cacheline size (64 bytes). This is the current recommendation. Fixes: 3724ace582d9 ("EDAC/mc: Fix grain_bits calculation") Signed-off-by: Yazen Ghannam Signed-off-by: Borislav Petkov Cc: "linux-edac@vger.kernel.org" Cc: James Morse Cc: Mauro Carvalho Chehab Cc: Robert Richter Cc: Tony Luck Link: https://lkml.kernel.org/r/20191022203448.13962-7-Yazen.Ghannam@amd.com [jwang: backport to 4.14 for fix warning during memory error. ] Signed-off-by: Jack Wang Signed-off-by: Sasha Levin --- drivers/edac/amd64_edac.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c index 40fb0e7ff8fd9..b36abd2537863 100644 --- a/drivers/edac/amd64_edac.c +++ b/drivers/edac/amd64_edac.c @@ -2863,6 +2863,7 @@ static int init_csrows(struct mem_ctl_info *mci) dimm = csrow->channels[j]->dimm; dimm->mtype = pvt->dram_type; dimm->edac_mode = edac_mode; + dimm->grain = 64; } }