Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp3023682pxb; Mon, 18 Oct 2021 06:48:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzx63b3UH+fM039o55IqH1/8zQ9w3hdJN/nQ3kO0QgVQUj3c08CA7MqDonwk7M8Dx6ye2ud X-Received: by 2002:a17:90b:4c86:: with SMTP id my6mr33862508pjb.77.1634564935646; Mon, 18 Oct 2021 06:48:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634564935; cv=none; d=google.com; s=arc-20160816; b=y0S5QHC0KQ2z8pUXUbqmvG/rj1fJpghAzj8Kx9Xxvv1SQnWEPZSSeVEH+uT03ZZfYf imDe+E7pxgg8V5OYz/gBZfD+K9PFvJe/cs0+jAbqhhNOJ8tWhfK7HskUWo3mFp+u5TK5 LNxPd3xoQU7z/B0RcDtqz8aaHBmACzupLV93hycD4bHa+MeOzLXXRaqGpdf/rxLe2qUb jpiTFKKaf7FDhw5DfusoZQ/vR1ZtGecNJ/aUt5fj4tGywNn+inE5WUsh+AYTKc8K7Q8g m1HZM3y0JQhYIsdeNHN6EDNgIm9DBqmxFxcLoGhTZoYiCcKHdOkzLAA8wqvRXdf+9PMx NmKA== 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=HCPjvtjl3YfjSyJcVjnFjHH4DWXUQmxlhR32w930GgMEqjC26o9/VlNRd0NZseQG8f C0IJoCFGIuWfRQse1IeOJDLJKEE4lyGU9FlXenfdXONBFXeeyskL16BwQYKFcEtVqAUf ENIj+GUTC9/KXLSLkRA7/w2yIsMpS1shN7bJBHzFxI09BPl0LEZBAPylxos68XJBcN6b gI15Co/ITOZacI4F2FIUnBbuGkpwIfUdiF9hlQWS+F1ZtjO5jc+QwV8GYjCJChLmEpNa tT15ry5PMcJO8ObsB5dSioiu4nXzREvCYJvXhlaBw4ScPFu+MxtfHVJG/QK7nx1/LwU2 +GAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=pIYBRxk2; 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 m16si1002234pgu.423.2021.10.18.06.48.42; Mon, 18 Oct 2021 06:48:55 -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=pIYBRxk2; 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 S232058AbhJRNtA (ORCPT + 99 others); Mon, 18 Oct 2021 09:49:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:40186 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233867AbhJRNqR (ORCPT ); Mon, 18 Oct 2021 09:46:17 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F1617615E2; Mon, 18 Oct 2021 13:35:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1634564154; bh=e8qQFMpLhHNOyVhKGd/xjg6BC5ZtnpHOFVL2vcM3arY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pIYBRxk2mPGcLQeFf+fJG3UREgee0VIHniYKDsKyiI/LJPMoXjTI34OwfBuMSWfXu 5TpSa58poD8G1NwBRZNvaWXs35UQXkP9FJiYWTbT3ysoXl0vU+qmwenjf7nyvhw7C5 Ik9g+wIDFys6XATUDhjNvg/1b6YhaV+LGPC37nIo= 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.10 042/103] EDAC/armada-xp: Fix output of uncorrectable error counter Date: Mon, 18 Oct 2021 15:24:18 +0200 Message-Id: <20211018132336.138083507@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211018132334.702559133@linuxfoundation.org> References: <20211018132334.702559133@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,