Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp3027966pxb; Mon, 18 Oct 2021 06:54:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxBXYxWSQ5duZA6P4dCgKPkJ6bumegLOepdh2rCJASa27XryLSNNywBn3mX7QPB3ANa7HtG X-Received: by 2002:a63:79c1:: with SMTP id u184mr24125550pgc.19.1634565290372; Mon, 18 Oct 2021 06:54:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634565290; cv=none; d=google.com; s=arc-20160816; b=ROotrtXBPMH/h2tmJhmYObgWyF0YRZ+8hwuqv9MvHhlDf2pCZn81/kXlc6cEc11imt r1dKOovswWas7bTJytXwSrs/4HXguQe1C5FLO8HTnNalJ2+E61TvPqGDOQHvgSsZScsz uknMvOJYlnEcE+W8MeaOVVHc94uBBPGaw6SiwXyNQU1rTDaGb+0hO0QmyXJ0Mk6ujSJ3 lNK2xmfmV9alRYQ6DuUm7Yfu2ZqGPUzt8uTiMLr+GSdh9lUmLA/LS8YjujX8lo8e2ywI HjrMD6fHdXkilj+xrMYbcW+0Ag68RSUd9lTV2/4fdBBhgK3h6od765mEJ8+1wSOQ9tBi 4vDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JZnLjA0QbpW2xt+HGQ1OdHCPeatyL+bu1mFrrOetU1c=; b=GFY2sFIE207cDFehsruI55fHCipLI+MUoJfWEQzL4Sm9nucmX2nt9tgVgGcfEPbH5m 32T4rXbJ458Ftl2kpf0KBt5aFxtx6HJHSkYPtLgYuavIUiB+mD4XJxo9rFWdtpM3CTKO JredX8Knh8+sFs2/4JPNFs8GzbCS09FcGGg3dvSiA1LLX7Wvo1Mnb+eJelDnmPgQ9aK+ Lx7k6Dn4nWrFSac5R+qyT5qzZabPhqkJ7T9qAh+fK8tQZXupeqIx1j1egGWG5YwlaakG 1ln3g6Rg/eWHuYGEVqCSzW9aiLx+9THVZ+O6iKsPsGrVI0rUSctks0v0Tsrn5yTwcXm6 BdGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RyOdohwW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p15si2605630pfh.253.2021.10.18.06.54.37; Mon, 18 Oct 2021 06:54:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=RyOdohwW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234346AbhJRNzw (ORCPT + 99 others); Mon, 18 Oct 2021 09:55:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:57730 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234326AbhJRNxU (ORCPT ); Mon, 18 Oct 2021 09:53:20 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6F666619E9; Mon, 18 Oct 2021 13:39:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1634564351; bh=e8qQFMpLhHNOyVhKGd/xjg6BC5ZtnpHOFVL2vcM3arY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RyOdohwWvd9KmXNtjfsjEg0sd3sTq9iiZ7WGE1cIrqOcfCNlTKHjifkVHKLZGgaUY elp7l/Oo2nC75PAtaXCSpPB9tKt+Ojmd7jllFQ2YtkxKbeW8gwNO6obzKjXPRTbBif jlDoF/o3laQPhm6W/3cCxPaYqauZms4Vb7CMWDeE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans Potsch , Borislav Petkov Subject: [PATCH 5.14 056/151] EDAC/armada-xp: Fix output of uncorrectable error counter Date: Mon, 18 Oct 2021 15:23:55 +0200 Message-Id: <20211018132342.519237962@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211018132340.682786018@linuxfoundation.org> References: <20211018132340.682786018@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans Potsch commit d9b7748ffc45250b4d7bcf22404383229bc495f5 upstream. The number of correctable errors is displayed as uncorrectable errors because the "SBE" error count is passed to both calls of edac_mc_handle_error(). Pass the correct uncorrectable error count to the second edac_mc_handle_error() call when logging uncorrectable errors. [ bp: Massage commit message. ] Fixes: 7f6998a41257 ("ARM: 8888/1: EDAC: Add driver for the Marvell Armada XP SDRAM and L2 cache ECC") Signed-off-by: Hans Potsch Signed-off-by: Borislav Petkov Cc: Link: https://lkml.kernel.org/r/20211006121332.58788-1-hans.potsch@nokia.com Signed-off-by: Greg Kroah-Hartman --- drivers/edac/armada_xp_edac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/edac/armada_xp_edac.c +++ b/drivers/edac/armada_xp_edac.c @@ -178,7 +178,7 @@ static void axp_mc_check(struct mem_ctl_ "details unavailable (multiple errors)"); if (cnt_dbe) edac_mc_handle_error(HW_EVENT_ERR_UNCORRECTED, mci, - cnt_sbe, /* error count */ + cnt_dbe, /* error count */ 0, 0, 0, /* pfn, offset, syndrome */ -1, -1, -1, /* top, mid, low layer */ mci->ctl_name,