From patchwork Wed May 29 08:44:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Richter X-Patchwork-Id: 165346 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp9580824ili; Wed, 29 May 2019 01:45:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqyIUJiUKAcjPk46/qddSAMGX/bO7f+WjnTlz1qe+npyWOGyejHJeBITvpLWpicLfdMvuHnk X-Received: by 2002:a62:e217:: with SMTP id a23mr103456255pfi.128.1559119541804; Wed, 29 May 2019 01:45:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559119541; cv=none; d=google.com; s=arc-20160816; b=RbOoVuEJhMGIAPS5reQM+qtMC0dB9GO1rC1aX2G/TyLdR9wBlgjiEd8ekXh5LSwiCY kvX+mcImiKgD792zygcMJVsYZTWA1Qi5AScblmFb1MurqqlRh5VhPWzi9glr6ITArzrp NH3qAHWxQ3reF0OM34D/IL5JM8/38IS7tFC1WChK7JtmnEfAjLw1OycUu5aKdP5jfVYy 7rpLRFJHJZupwAolW7kRRT/nWUWMlWFcA5r6OWSThpKWc8L5cDzP1oTfx0mMaWJH3kuK QTSczTs8B17PLKNj18idpqd4WQ6lwaC/RauVJ3MlVL0w0EfmT5kjIQNFeCdvMHn/DBIv gWxA== 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=nKwZxi1myEspKdU3HROV4Me4eokbwIVj/uTY/R3dhxo=; b=LWr4Atm9458eI2iQl3g/IBQqVWx5YTvYE0tu1YxFFCV7zO2ddEElIx8cYIngyttBgo w9/FP0Dsc5URcGfZt6V/v2z3d2TGjTsVs4Pnyrxpcpyf8ePbP1cVOb1B/Ju6+tH5ty3s C8ZzCLgzrwLl5VvPEm0WTyICGc6WbT8lxHR4uy0nBhoZpUo8eCcvRiyqVKp4bE7TYlpg XuFyhEEc2hyTvpOhrPU8yunwtQGrQ4Ih7Ww2bwc7k1RwhfDS1XebEAC3uTEa1ZKNMKED uYrFgVI7UoVv56RYRw3HFnsefvYG/1j1I6MW9A6zJX4FoaFoEPWfF5Uw0Q8yKf8Zc9mG AOAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0818 header.b=w3AdXKDR; dkim=pass header.i=@marvell.onmicrosoft.com header.s=selector2-marvell-onmicrosoft-com header.b=eLIH9LfL; 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 y15si19958860pgf.559.2019.05.29.01.45.41; Wed, 29 May 2019 01:45:41 -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=w3AdXKDR; dkim=pass header.i=@marvell.onmicrosoft.com header.s=selector2-marvell-onmicrosoft-com header.b=eLIH9LfL; 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 S1727067AbfE2Ipk (ORCPT + 30 others); Wed, 29 May 2019 04:45:40 -0400 Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]:49538 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726652AbfE2Ioj (ORCPT ); Wed, 29 May 2019 04:44:39 -0400 Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x4T8doqY017791; Wed, 29 May 2019 01:44:32 -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=nKwZxi1myEspKdU3HROV4Me4eokbwIVj/uTY/R3dhxo=; b=w3AdXKDRXex63m2nSJwhNLXV3s/qiwqH9H5HU00dcM7fS4gE7Ex6sY6dZvMc4/Ro4MKY n3PE746RYUZhnL3xnzYz3HV0ITMIc8jYslQxp+Q+Ld8oxhlePoDk01Dfx3MtULV7djdv 0q+ll6i/BRbNM9nwvAigjDAIk5EY6y70ZHc2zn57ucNfHrD655ucL/5KLkcIAAV6B5du 7VgXaZzHQd+8D+S90svAGnxH2NrgJXCnEcIvByExKOPjcsCrVxtGvve/brB5FSoU5ACs C2CscqT4lyjMWS8QTlpg1lGuSmt9hnCHCtagFS7FRcTRKh1MXbZxi08I1Dul+eCqKFgx tw== Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0b-0016f401.pphosted.com with ESMTP id 2sskp88p5n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 29 May 2019 01:44:32 -0700 Received: from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Wed, 29 May 2019 01:44:30 -0700 Received: from NAM03-CO1-obe.outbound.protection.outlook.com (104.47.40.57) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Wed, 29 May 2019 01:44:30 -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=nKwZxi1myEspKdU3HROV4Me4eokbwIVj/uTY/R3dhxo=; b=eLIH9LfLd+NAmu/dtlOcJeeyT4SlvjHt+fidY8lwQ3bQ9N5jPwMHKKwgmFsde7i/lm5/Y8Qd7SHSwnwZaf8IetqVII1EYfK9h4Zp9IHcosfCMgm3os2WGpCelY5zDCkcAUn7mtHMNl95fxxgA6+fgQ7VE3YgpBfGqPkyc34KFEI= 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:28 +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:28 +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 11/21] EDAC, ghes: Unify trace_mc_event() code with edac_mc driver Thread-Topic: [PATCH 11/21] EDAC, ghes: Unify trace_mc_event() code with edac_mc driver Thread-Index: AQHVFfq6gjLVec/X00qyYoFkU9EVEg== Date: Wed, 29 May 2019 08:44:28 +0000 Message-ID: <20190529084344.28562-12-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: 5eff7721-877f-4761-eb6a-08d6e411dc6e 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:989; 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)(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: oyoSj9ed3P8VMy8lFG/zguykNKkF1mut9QjgzKskcy2fO9/v2Yf7Uc/SpZp1GrcTiN5Y9wOeMJiSQC1ZKvcoTmtdWdfD0Vzth7XaSGZj0jORqmZloU60Jf3yWruyE62uiazvqtp4U2M3gKT+Xy01fRfxu5zgSzGy8KI+VbmmklFoxixH1dVQq6IQMEU0AM14xcOUzEZaSpOjKuemMWLUc2UDXKAAvd+hNcNmEZ4DUuTBhAjne5h/h4YlaEo1D3nuhMJuI4qpNf3gafKCu/ZjZFgS3SlLeyX7B7Tbt3f3DTwzu4Onszw6Rqt4FW8ahFhZjzXZUCRFVxZFVQ5LW3n3bRvP8soIA63loHT9A0muVsGSQEHWLhbKFUtCPk0ZztuuOSckflYCrp35ryyJPTfGQJr7B9XRu3c9zM/a4tqD+QA= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 5eff7721-877f-4761-eb6a-08d6e411dc6e X-MS-Exchange-CrossTenant-originalarrivaltime: 29 May 2019 08:44:28.6169 (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 Almost duplicate code, remove it. Note: there is a difference in the calculation of the grain_bits, using the edac_mc's version here. Signed-off-by: Robert Richter --- drivers/edac/edac_mc.c | 22 +++++++++++----------- drivers/edac/ghes_edac.c | 9 --------- 2 files changed, 11 insertions(+), 20 deletions(-) -- 2.20.1 diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index b1bd0a23d02b..8613a31dc86c 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c @@ -1010,6 +1010,17 @@ void edac_raw_mc_handle_error(const enum hw_event_mc_err_type type, struct edac_raw_error_desc *e) { char detail[80]; + u8 grain_bits; + + /* Report the error via the trace interface */ + grain_bits = fls_long(e->grain) + 1; + + if (IS_ENABLED(CONFIG_RAS)) + trace_mc_event(type, e->msg, e->label, e->error_count, + mci->mc_idx, e->top_layer, e->mid_layer, + e->low_layer, + (e->page_frame_number << PAGE_SHIFT) | e->offset_in_page, + grain_bits, e->syndrome, e->other_detail); /* Memory type dependent details about the error */ if (type == HW_EVENT_ERR_CORRECTED) { @@ -1050,7 +1061,6 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type, int row = -1, chan = -1; int pos[EDAC_MAX_LAYERS] = { top_layer, mid_layer, low_layer }; int i, n_labels = 0; - u8 grain_bits; struct edac_raw_error_desc *e = &mci->error_desc; bool per_layer_report = false; @@ -1192,16 +1202,6 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type, if (p > e->location) *(p - 1) = '\0'; - /* Report the error via the trace interface */ - grain_bits = fls_long(e->grain) + 1; - - if (IS_ENABLED(CONFIG_RAS)) - trace_mc_event(type, e->msg, e->label, e->error_count, - mci->mc_idx, e->top_layer, e->mid_layer, - e->low_layer, - (e->page_frame_number << PAGE_SHIFT) | e->offset_in_page, - grain_bits, e->syndrome, e->other_detail); - dimm = edac_get_dimm(mci, top_layer, mid_layer, low_layer); edac_raw_mc_handle_error(type, mci, dimm, e); diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c index c18f16bc9e4d..f6ea4b070bfe 100644 --- a/drivers/edac/ghes_edac.c +++ b/drivers/edac/ghes_edac.c @@ -202,7 +202,6 @@ void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err) struct ghes_edac_pvt *pvt = ghes_pvt; unsigned long flags; char *p; - u8 grain_bits; if (!pvt) return; @@ -434,14 +433,6 @@ void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err) if (p > pvt->other_detail) *(p - 1) = '\0'; - /* Generate the trace event */ - grain_bits = fls_long(e->grain); - - trace_mc_event(type, e->msg, e->label, e->error_count, - mci->mc_idx, e->top_layer, e->mid_layer, e->low_layer, - (e->page_frame_number << PAGE_SHIFT) | e->offset_in_page, - grain_bits, e->syndrome, e->other_detail); - dimm_info = edac_get_dimm_by_index(mci, e->top_layer); edac_raw_mc_handle_error(type, mci, dimm_info, e);