From patchwork Wed May 29 08:44:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Richter X-Patchwork-Id: 165333 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp9579951ili; Wed, 29 May 2019 01:44:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqycR4RgQNQSH3JbxOSzo4jUgN6qoG8FVS+ForO//oAQ/HT+0dSZ7CyngZWFhCFusQsalxkz X-Received: by 2002:a63:d205:: with SMTP id a5mr46574437pgg.402.1559119483349; Wed, 29 May 2019 01:44:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559119483; cv=none; d=google.com; s=arc-20160816; b=WN9tyzKfxlSpPm7kxaEV+5GopqtYrbD/vm5DuUWOikf/0diwa0SdVbrzUu0DdK1PF2 Vi7UNH//BSOXEr+MrT9Gg5NECUC3uYCnnLtbNtD1PbTHWLkHf8V2iaTuzlKDefq1yXrH SFmfaf8ef+XEYwfNgitiibLcNzp3V+RlaAjFW7Eub/N04fWRE437H3+fLlfQbuN2wXg+ ppP2XnHWVLozIx/WjiOBVZZA3QH9dhhyXDsP4weA/h7tTjpIE2H0110ZXjllMeM/a6mY aD6JfN6C/tFsnHkcu3biYjxdb7HL7lcqNjxx+0TDHtKw853KZIBJT4OkpEeQBPjQHob2 /amA== ARC-Message-Signature: i=1; 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=8FEAF0psG8LxSK8L9uX3vJMd6HSLnf5ElDoup3pLX9E=; b=kWQGDDqpc6TuO+Q94th6JKpEw1B29SgJwZS0f7u93CsgUtzpc8hEAGbHbWht96yFTJ c7nPegq6J64n/X45H3ACY+GE6cq9SNQ+3EJ+L5thZVe2PPHMNitMEgcfJBQTFHpQXyZT KFMpzAv51nB3gE0wNVwEl7S6XCGzxj/HrqxbE7w5OY6qQGQO3B5MR8WcGHurkfDL/q/+ MM+CAhVmWs+8vcDuJ7S/0In53Gnp9+gcrYw+5ZBl3ISmzmN0bQzVVT1CaInTJxVUkRVy mBL6FRYSTIrvURfwHqMxO6E74mEr3dKJza/IO5MO1g2xW4zeWQtz4zTmLoH8DEzDiEVu aFBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0818 header.b=P+jr15EO; dkim=pass header.i=@marvell.onmicrosoft.com header.s=selector2-marvell-onmicrosoft-com header.b=Eu947RFy; 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 s36si24801212pld.278.2019.05.29.01.44.42; Wed, 29 May 2019 01:44:43 -0700 (PDT) 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=P+jr15EO; dkim=pass header.i=@marvell.onmicrosoft.com header.s=selector2-marvell-onmicrosoft-com header.b=Eu947RFy; 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 S1726741AbfE2Iom (ORCPT + 30 others); Wed, 29 May 2019 04:44:42 -0400 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:35370 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726534AbfE2Iof (ORCPT ); Wed, 29 May 2019 04:44:35 -0400 Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x4T8fJFa023313; Wed, 29 May 2019 01:44:28 -0700 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=8FEAF0psG8LxSK8L9uX3vJMd6HSLnf5ElDoup3pLX9E=; b=P+jr15EO4IZgV6ff/td3lDe+Sg8H8RbpJvJBwTLjRAsdDyBegHz5zHlD1m8CAoAP9PIu hnsGXgjFYXCZW4kNMkh4vNcDfhYa/2AGzrG36AbGBEFTdBBYuPzPCxLM3RIP8CEigaOw YuTa8KdJyr7pm4CEtj38taFRxYc+LgOJZYFiWMftA8aiYrLTnetZen9MJ4k2Y28TwQP/ QeJSJSiJJN5JnPle4fcqKEXHsIcwIVN4eASkmTC1D6BBppQsBDaMCaUMRXx00HTsVRpe HSsNoDCUx3wW+IhsHQ1bWNQdA8xM1BuVPKEs2HiIm+EJCv4J3IcyfbVhcox9L1AWHIHX 0A== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0a-0016f401.pphosted.com with ESMTP id 2sspkpg1pn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 29 May 2019 01:44:28 -0700 Received: from SC-EXCH04.marvell.com (10.93.176.84) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Wed, 29 May 2019 01:44:27 -0700 Received: from NAM03-CO1-obe.outbound.protection.outlook.com (104.47.40.55) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Wed, 29 May 2019 01:44:27 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.onmicrosoft.com; s=selector2-marvell-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8FEAF0psG8LxSK8L9uX3vJMd6HSLnf5ElDoup3pLX9E=; b=Eu947RFyt2D2GZMpY8FPjnW5vXK1pkgI3Tz4YKGjZ8SywE5RTjAP59QrJj4qKnzl0Lj6TFXwzmCwvz7VsHZ70kp7IqmyZ5UjOJAxC2NQ41piv+4XjepYOfjWW9Onw8/HRQyjPXldjNC6Gd69d8XjzemM1VRDOJEclRprOoQS55M= Received: from MN2PR18MB3408.namprd18.prod.outlook.com (10.255.238.217) by MN2PR18MB3437.namprd18.prod.outlook.com (10.255.239.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1922.20; Wed, 29 May 2019 08:44:22 +0000 Received: from MN2PR18MB3408.namprd18.prod.outlook.com ([fe80::7c9a:f3bf:fe2e:fe4a]) by MN2PR18MB3408.namprd18.prod.outlook.com ([fe80::7c9a:f3bf:fe2e:fe4a%4]) with mapi id 15.20.1922.021; Wed, 29 May 2019 08:44:22 +0000 From: Robert Richter To: Borislav Petkov , Tony Luck , "James Morse" , Mauro Carvalho Chehab CC: "linux-edac@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Robert Richter Subject: [PATCH 08/21] EDAC, mc: Rework edac_raw_mc_handle_error() to use struct dimm_info Thread-Topic: [PATCH 08/21] EDAC, mc: Rework edac_raw_mc_handle_error() to use struct dimm_info Thread-Index: AQHVFfq2kwJzIeiRI0WEsVWViUPdKQ== Date: Wed, 29 May 2019 08:44:22 +0000 Message-ID: <20190529084344.28562-9-rrichter@marvell.com> References: <20190529084344.28562-1-rrichter@marvell.com> In-Reply-To: <20190529084344.28562-1-rrichter@marvell.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR01CA0046.eurprd01.prod.exchangelabs.com (2603:10a6:20b:e0::23) To MN2PR18MB3408.namprd18.prod.outlook.com (2603:10b6:208:16c::25) x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [78.54.13.57] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 815a934c-50db-40a7-f8ed-08d6e411d8c5 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:MN2PR18MB3437; x-ms-traffictypediagnostic: MN2PR18MB3437: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5236; x-forefront-prvs: 0052308DC6 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(366004)(346002)(396003)(376002)(39860400002)(136003)(189003)(199004)(8936002)(4326008)(53936002)(50226002)(110136005)(107886003)(68736007)(36756003)(5660300002)(54906003)(11346002)(26005)(186003)(52116002)(2906002)(2616005)(476003)(446003)(6506007)(14454004)(66476007)(25786009)(478600001)(386003)(86362001)(486006)(81166006)(81156014)(8676002)(305945005)(316002)(7736002)(14444005)(256004)(99286004)(76176011)(6512007)(6436002)(73956011)(64756008)(66446008)(66556008)(66066001)(3846002)(66946007)(1076003)(6486002)(102836004)(71190400001)(71200400001)(6116002); DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR18MB3437; 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-message-info: bx7JvwECjqQz3uHGXPqhlPpF9aXIyysgZ9Jy5IQlEDixijiJsnZ7EuM3kUBuTS9YkjzQNF6vaz6E0HW058lw/aw7fncSXUb9UT0Y79QJJdgMNmDRfkNV9W5MTfa4vlihGwHnWPvA6HxBk/UO69Q/hL7fF1FJeR2bkO03W5GYlbphBPz5cV4oWbQdAcnklkVkO0SPiFc7krEiz+ioyypezR6g7Z/d6g8ce4tSuYMaREteFcmlaAOLVcv6PChSslyrJMh2WGYCALvNalLUao0Sk9IbTAjLqGBW0FY7WQo66eselaDMN+hp0gAPTaNZSkx78eQr3X2ODsdYdAYFnzS0B/xS1c7JvavrfEjQt1p7atEBiSZyHXn216OyBUItScKPGSLk6o5GnNUG7bxc3waKnI4rMAGInRDZeWhD9HlDU40= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 815a934c-50db-40a7-f8ed-08d6e411d8c5 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 May 2019 08:44:22.4695 (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: rrichter@marvell.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR18MB3437 X-OriginatorOrg: marvell.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-05-29_05:, , signatures=0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Rework edac_raw_mc_handle_error() to use struct dimm_info. Signed-off-by: Robert Richter --- drivers/edac/edac_mc.c | 28 +++++++++++++--------------- drivers/edac/edac_mc.h | 2 ++ drivers/edac/ghes_edac.c | 6 +++++- 3 files changed, 20 insertions(+), 16 deletions(-) -- 2.20.1 diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 2e461c9e1a89..b1bd0a23d02b 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c @@ -889,11 +889,9 @@ const char *edac_layer_name[] = { EXPORT_SYMBOL_GPL(edac_layer_name); static void edac_inc_ce_error(struct mem_ctl_info *mci, - const int pos[EDAC_MAX_LAYERS], + struct dimm_info *dimm, const u16 count) { - struct dimm_info *dimm = edac_get_dimm(mci, pos[0], pos[1], pos[2]); - mci->ce_mc += count; if (dimm) @@ -903,11 +901,9 @@ static void edac_inc_ce_error(struct mem_ctl_info *mci, } static void edac_inc_ue_error(struct mem_ctl_info *mci, - const int pos[EDAC_MAX_LAYERS], - const u16 count) + struct dimm_info *dimm, + const u16 count) { - struct dimm_info *dimm = edac_get_dimm(mci, pos[0], pos[1], pos[2]); - mci->ue_mc += count; if (dimm) @@ -917,8 +913,8 @@ static void edac_inc_ue_error(struct mem_ctl_info *mci, } static void edac_ce_error(struct mem_ctl_info *mci, + struct dimm_info *dimm, const u16 error_count, - const int pos[EDAC_MAX_LAYERS], const char *msg, const char *location, const char *label, @@ -946,7 +942,7 @@ static void edac_ce_error(struct mem_ctl_info *mci, error_count, msg, msg_aux, label, location, detail); } - edac_inc_ce_error(mci, pos, error_count); + edac_inc_ce_error(mci, dimm, error_count); if (mci->scrub_mode == SCRUB_SW_SRC) { /* @@ -970,8 +966,8 @@ static void edac_ce_error(struct mem_ctl_info *mci, } static void edac_ue_error(struct mem_ctl_info *mci, + struct dimm_info *dimm, const u16 error_count, - const int pos[EDAC_MAX_LAYERS], const char *msg, const char *location, const char *label, @@ -1005,15 +1001,15 @@ static void edac_ue_error(struct mem_ctl_info *mci, msg, msg_aux, label, location, detail); } - edac_inc_ue_error(mci, pos, error_count); + edac_inc_ue_error(mci, dimm, error_count); } void edac_raw_mc_handle_error(const enum hw_event_mc_err_type type, struct mem_ctl_info *mci, + struct dimm_info *dimm, struct edac_raw_error_desc *e) { char detail[80]; - int pos[EDAC_MAX_LAYERS] = { e->top_layer, e->mid_layer, e->low_layer }; /* Memory type dependent details about the error */ if (type == HW_EVENT_ERR_CORRECTED) { @@ -1021,7 +1017,7 @@ void edac_raw_mc_handle_error(const enum hw_event_mc_err_type type, "page:0x%lx offset:0x%lx grain:%ld syndrome:0x%lx", e->page_frame_number, e->offset_in_page, e->grain, e->syndrome); - edac_ce_error(mci, e->error_count, pos, e->msg, e->location, + edac_ce_error(mci, dimm, e->error_count, e->msg, e->location, e->label, detail, e->other_detail, e->page_frame_number, e->offset_in_page, e->grain); } else { @@ -1029,7 +1025,7 @@ void edac_raw_mc_handle_error(const enum hw_event_mc_err_type type, "page:0x%lx offset:0x%lx grain:%ld", e->page_frame_number, e->offset_in_page, e->grain); - edac_ue_error(mci, e->error_count, pos, e->msg, e->location, + edac_ue_error(mci, dimm, e->error_count, e->msg, e->location, e->label, detail, e->other_detail); } @@ -1206,6 +1202,8 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type, (e->page_frame_number << PAGE_SHIFT) | e->offset_in_page, grain_bits, e->syndrome, e->other_detail); - edac_raw_mc_handle_error(type, mci, e); + dimm = edac_get_dimm(mci, top_layer, mid_layer, low_layer); + + edac_raw_mc_handle_error(type, mci, dimm, e); } EXPORT_SYMBOL_GPL(edac_mc_handle_error); diff --git a/drivers/edac/edac_mc.h b/drivers/edac/edac_mc.h index 4165e15995ad..b816cf3caaee 100644 --- a/drivers/edac/edac_mc.h +++ b/drivers/edac/edac_mc.h @@ -214,6 +214,7 @@ extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, * * @type: severity of the error (CE/UE/Fatal) * @mci: a struct mem_ctl_info pointer + * @dimm: a struct dimm_info pointer * @e: error description * * This raw function is used internally by edac_mc_handle_error(). It should @@ -222,6 +223,7 @@ extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, */ void edac_raw_mc_handle_error(const enum hw_event_mc_err_type type, struct mem_ctl_info *mci, + struct dimm_info *dimm, struct edac_raw_error_desc *e); /** diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c index 2c8f816c2cc7..4a13c394fa66 100644 --- a/drivers/edac/ghes_edac.c +++ b/drivers/edac/ghes_edac.c @@ -196,6 +196,7 @@ static void ghes_edac_dmidecode(const struct dmi_header *dh, void *arg) void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err) { + struct dimm_info *dimm_info; enum hw_event_mc_err_type type; struct edac_raw_error_desc *e; struct mem_ctl_info *mci; @@ -440,7 +441,10 @@ void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err) (e->page_frame_number << PAGE_SHIFT) | e->offset_in_page, grain_bits, e->syndrome, pvt->detail_location); - edac_raw_mc_handle_error(type, mci, e); + dimm_info = edac_get_dimm_by_index(mci, e->top_layer); + + edac_raw_mc_handle_error(type, mci, dimm_info, e); + spin_unlock_irqrestore(&ghes_lock, flags); }