From patchwork Thu Dec 5 09:38:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Richter X-Patchwork-Id: 180866 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp1727989ile; Thu, 5 Dec 2019 01:38:19 -0800 (PST) X-Google-Smtp-Source: APXvYqxN4ikKycQI7PVE+DV3vyeetED4/E6nTOnv2tUFlD8XR17ykQpudDyXHeX75jIWOqrKAciN X-Received: by 2002:a05:6830:1e7c:: with SMTP id m28mr6070453otr.131.1575538699327; Thu, 05 Dec 2019 01:38:19 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1575538699; cv=pass; d=google.com; s=arc-20160816; b=ay4S7zkPLSrggP3HKdmfgHTE/UNJMH3yRnixLmT/S3AG34qmuCIkRxmu12tQp7vTVL ODe3HaP2uoOv3z+bOFOQEwmARpEJquHSJ7K93ETswiUzXkGZBmCggYi7ACNhrKW4XJZa IOUCTVQYqBhYNqIjr+TQdJz9TFs3H3OEVnFjgsNjB3f2HBFRqDTlDQ6k8SsCwvqNs4TL 2V/by9K5LekonhbY65UcjqECa3b5hXx4veDISj2GPMerwd6V1btVEZgqBaqRkMyIMnI9 ugSiJVUN4BrA9vCLYaN++q215GtmQodCjRw0+6SdRaM4icJ0ca93EHfFqef++XfSizLG Aduw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:subject:cc:to:from:dkim-signature :dkim-signature; bh=YYp/oOuA8n2lwLMoUuW95cJ2bKYWXJPqEGaTueCLunw=; b=0MQvffLlZ+EhVKnBad7hPfFc49LU4OP9rP0MQsb88WTlRjchTjbsIHt1whnQGp2Val 8vLUrpyWHn9sfjOWw+VhQOYcQsSHaWtVsSUsa55VZDGTTEJScwhMEufIbdXXEfl7rZx9 gZxxtm0eHXH7YQBd95qJ2PbFNhAdR2ZRAIqtNVZNHRMzoaMHLrtKVaA/c3DbHfvS5uky AWYmYJSaeyLr4vZhBXT30bHztqCpTCSmi/3DtUbVamLf/IGdUTgu8FouOmviCku2q7Zh cYL3VQ3zKBrr4WtIA3Rmf6QJQJ2Zertg0civo9UTADRmC20wuUIWKqS6xmCWfNBR2VQ2 cW+w== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0818 header.b=ogsSB1Jb; dkim=pass header.i=@marvell.onmicrosoft.com header.s=selector1-marvell-onmicrosoft-com header.b=UVJaZ+KS; arc=pass (i=1 spf=pass spfdomain=marvell.com dkim=pass dkdomain=marvell.com dmarc=pass fromdomain=marvell.com); 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=marvell.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t142si4678805oih.242.2019.12.05.01.38.18; Thu, 05 Dec 2019 01:38:19 -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=@marvell.com header.s=pfpt0818 header.b=ogsSB1Jb; dkim=pass header.i=@marvell.onmicrosoft.com header.s=selector1-marvell-onmicrosoft-com header.b=UVJaZ+KS; arc=pass (i=1 spf=pass spfdomain=marvell.com dkim=pass dkdomain=marvell.com dmarc=pass fromdomain=marvell.com); 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=marvell.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729276AbfLEJiS (ORCPT + 27 others); Thu, 5 Dec 2019 04:38:18 -0500 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:40864 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729215AbfLEJiQ (ORCPT ); Thu, 5 Dec 2019 04:38:16 -0500 Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xB59bcUr023683; Thu, 5 Dec 2019 01:38:09 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pfpt0818; bh=YYp/oOuA8n2lwLMoUuW95cJ2bKYWXJPqEGaTueCLunw=; b=ogsSB1JbFHKtODdhmck6Zioufmn6yFKdCLgvxOnheapgK1wPdXuTGQ0KnkM3EstnX7fg ax4CD66VFpNp6piuNrFHxkO3MD4jlJGgCzwPWb7yJx2jjthhKN6tGj206RYFrDiuweYA leH52mDE9KWuswTn55OORsj+CerGHkrg3NuqtroV0/VQWUbqggT4tfKTpXg3MJPSL/z1 dnjs6Q+SyRVHFrZRDDXwTCBcUfdnfiw5UaJJaoEp8MNeaAPGje8Ts0KEqSYaR12FDX6Q 3+njaxYq4937/zk7ZJZGpTurEYk3uwNH0IT80xENVGRMRwrMEzR0MDfrm9NUGjg/xw7G Zg== Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0a-0016f401.pphosted.com with ESMTP id 2wnvgvrd07-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 05 Dec 2019 01:38:09 -0800 Received: from SC-EXCH04.marvell.com (10.93.176.84) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 5 Dec 2019 01:38:08 -0800 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (104.47.38.53) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Thu, 5 Dec 2019 01:38:08 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F8b3zeab3mtCKRN/27zVycDX8MmJGuEpA/44E4Si3H56qkLpe0Ps6Yl7C9jeD8raITBaqN795O/Gu5jFv9FJmDmkAIp4b8xZ2I3dkHxswH8ataOniJLlbu59AnEf78JDz2e1Z4s6b+abVBE3w/y9TQh9JhgkhPTN14ChLK+rR137oIB9RJpZyogyHOPuvOraiUpiSDfUcbFwt+arKo6JDmnkbMnikUwAZ++qT/HxzwU97ph/aQYUYywYG055th3zhoMv1C9jrftqOz37mDDtI7OstRZXqnoatQOVc3pwxakZSyYVxkMKd+CBLGcedjCeIjwDH0AkkadELF2kvLHqwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YYp/oOuA8n2lwLMoUuW95cJ2bKYWXJPqEGaTueCLunw=; b=VH1rQfBRvHtSSrP/57FKXGlk3PiCVdKD0dsG53LTk+fDSbZEYuEjwMp5uIA4taXZwPdQGmH5HgyhCquAJnnmu/3I2a6XELr1J0MuemKfOPvQaUCniYiCyCZoKQYnEK4VQh9FNFgp/AKd8cmvpZ7ReLBxPpQ8V4LPQ5fM3aKYcraId8ZrhVVTCvvAfDnB5ClZSgeN5DJYombxWHgvMtSGzguy+5UD+S6Qchc92WSHnEse0maFbC/tOW6RfkllSkemqzb1hK5h+nnQv1Q0K58eP5G2K2BIUsyQvNj9E63wN9aLtZX6cDjOdUAZSJclPPWIw4Xp4ODFHP/N08DqJxYanA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=marvell.com; dmarc=pass action=none header.from=marvell.com; dkim=pass header.d=marvell.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.onmicrosoft.com; s=selector1-marvell-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YYp/oOuA8n2lwLMoUuW95cJ2bKYWXJPqEGaTueCLunw=; b=UVJaZ+KSY/8oBr0HPKHxzZBxTJ37cwTSt27JjzmkARvajtVCzrdDv/yMPNTpnQDz1gnk/gxEWgT3rJyCh+xPkmXEO1SOsSXx2Do2D36F2rWO2chifdRy4wqvBKluTNSpc68Dqq1SFs5fe1h89LfhI4Zb4zTj60Mj49rkHou+uXw= Received: from MN2PR18MB3408.namprd18.prod.outlook.com (10.255.237.10) by MN2PR18MB2367.namprd18.prod.outlook.com (20.179.80.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2495.21; Thu, 5 Dec 2019 09:38:06 +0000 Received: from MN2PR18MB3408.namprd18.prod.outlook.com ([fe80::657c:6c81:859d:106]) by MN2PR18MB3408.namprd18.prod.outlook.com ([fe80::657c:6c81:859d:106%7]) with mapi id 15.20.2516.014; Thu, 5 Dec 2019 09:38:06 +0000 From: Robert Richter To: Borislav Petkov , Mauro Carvalho Chehab , Tony Luck CC: James Morse , Robert Richter , "linux-edac@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH v2 05/10] EDAC/mc: Create new function edac_inc_csrow() Thread-Topic: [PATCH v2 05/10] EDAC/mc: Create new function edac_inc_csrow() Thread-Index: AQHVq0+yPgEeAv730k+GRrQq6PBK8w== Date: Thu, 5 Dec 2019 09:38:06 +0000 Message-ID: <20191205093739.4040-6-rrichter@marvell.com> References: <20191205093739.4040-1-rrichter@marvell.com> In-Reply-To: <20191205093739.4040-1-rrichter@marvell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1PR05CA0170.eurprd05.prod.outlook.com (2603:10a6:3:f8::18) To MN2PR18MB3408.namprd18.prod.outlook.com (2603:10b6:208:165::10) x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [31.208.96.227] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7c74e149-7baf-4487-c74f-08d77966d4eb x-ms-traffictypediagnostic: MN2PR18MB2367: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5516; x-forefront-prvs: 02426D11FE x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(39860400002)(376002)(136003)(346002)(366004)(396003)(189003)(199004)(81166006)(14454004)(36756003)(6512007)(316002)(478600001)(54906003)(5660300002)(110136005)(186003)(8936002)(50226002)(6486002)(26005)(99286004)(66556008)(66476007)(81156014)(71190400001)(86362001)(66946007)(66446008)(64756008)(25786009)(8676002)(2906002)(71200400001)(6506007)(4326008)(2616005)(11346002)(102836004)(305945005)(1076003)(76176011)(52116002); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR18MB2367; H:MN2PR18MB3408.namprd18.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: marvell.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: LtXIVR5zZJNBs4smPiuMLPb76PjgR1+MsIQTGYbhN3wFntR6HIFB23AXdUFtGpBKIzC9nhpxJCI7HGgqS8+DkySlYqBSZGJz2saTF8OdDbsqxCKKaYKmomXUQ3fSBdUmilLnezc045lqfp+GZ5ViP8ZMC+QDNVk4rjYXyOaIgejW3f3lN6sK2FnhYpkAfzxHYaRR6vjDcELGfX5nQP944uijSFZ0eJvHuSG7EoeWxboD3YSiboZJpF387DcOzIAKQRZSaZ3oZSovXxd5M9Wpi3/hmhSU3yUfVeuJ6LnWYybEOSZhmSTDIm1plpuqXXNueAWpIcH0rBfiAFpiFqkVNIkzp6ZZcAkY5/fsYxfEYcUFexPNobPwbxO30K1F40OcLQsclSXeDbwF9XToSf1HOzcbBPrO5rvXF2a5fztAQcwro9fM3B7mPQOq1ELW5I4A MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 7c74e149-7baf-4487-c74f-08d77966d4eb X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Dec 2019 09:38:06.3690 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: WJ+qbs5JTr7I3QczDHGYtwZ8/0+80418nPRIkigjfJL/XkqOgd2KaI4dn+OOOv3OL+HrvsYLWciECwOmRPz8ww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR18MB2367 X-OriginatorOrg: marvell.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95, 18.0.572 definitions=2019-12-05_01:2019-12-04, 2019-12-05 signatures=0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Have a separate function to count errors in csrow/channel. This better separates code and reduces the indentation level. No functional changes. Signed-off-by: Robert Richter Reviewed-by: Mauro Carvalho Chehab --- drivers/edac/edac_mc.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) -- 2.20.1 diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index aff0630c02fc..e81d33960a0c 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c @@ -1089,6 +1089,26 @@ static void edac_ue_error(struct mem_ctl_info *mci, edac_inc_ue_error(mci, enable_per_layer_report, pos, error_count); } +static void edac_inc_csrow(struct edac_raw_error_desc *e, int row, int chan) +{ + struct mem_ctl_info *mci = error_desc_to_mci(e); + u16 count = e->error_count; + enum hw_event_mc_err_type type = e->type; + + if (row < 0) + return; + + edac_dbg(4, "csrow/channel to increment: (%d,%d)\n", row, chan); + + if (type == HW_EVENT_ERR_CORRECTED) { + mci->csrows[row]->ce_count += count; + if (chan >= 0) + mci->csrows[row]->channels[chan]->ce_count += count; + } else { + mci->csrows[row]->ue_count += count; + } +} + void edac_raw_mc_handle_error(struct edac_raw_error_desc *e) { struct mem_ctl_info *mci = error_desc_to_mci(e); @@ -1256,22 +1276,12 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type, chan = -2; } - if (!e->enable_per_layer_report) { + if (!e->enable_per_layer_report) strcpy(e->label, "any memory"); - } else { - edac_dbg(4, "csrow/channel to increment: (%d,%d)\n", row, chan); - if (p == e->label) - strcpy(e->label, "unknown memory"); - if (type == HW_EVENT_ERR_CORRECTED) { - if (row >= 0) { - mci->csrows[row]->ce_count += error_count; - if (chan >= 0) - mci->csrows[row]->channels[chan]->ce_count += error_count; - } - } else - if (row >= 0) - mci->csrows[row]->ue_count += error_count; - } + else if (!*e->label) + strcpy(e->label, "unknown memory"); + + edac_inc_csrow(e, row, chan); /* Fill the RAM location data */ p = e->location;