From patchwork Wed May 29 08:44:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Richter X-Patchwork-Id: 165335 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp9580057ili; Wed, 29 May 2019 01:44:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqweyGP3QWrPLif0Aelx2T5lgWY4gZE78KQK7+rTSjDE5LXNWSbXSUsKnX1qo3R2dOqA2smi X-Received: by 2002:a63:6cc5:: with SMTP id h188mr76528842pgc.105.1559119490535; Wed, 29 May 2019 01:44:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559119490; cv=none; d=google.com; s=arc-20160816; b=NnX6rEbGuSC2Jr6ayhv/NG+LUTHA0ZI+EtfinApyhdl/TXp/HZio774L3V42KZr7iX a1/1Kojp6my4vLoaZz7KdI0Pej/869a2jkY1JkTicGjxj5cHex9Oai31MfmwcOBBLapL LhAKm9T49KsbVf/GlR0maRz3R8Uphw26FO61MzZeJ8vs55UARw0HOIkUsgY+PIWIw4tE eH3PElbqjgbn+azGlPBLHD3b79Pi4+0EDwyKtYhgt2gwe/y/eCOsuM7fqxYQW+NXS6tr 2yVFVza+ejhH6kO+G4c+/tB5nfMJELGf+qxwXsrx15ZYA+egVbuLEZqqT6B8ogTmYLgL DCnA== 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=gH07SKJSQPdDv/5bA0/8ymvQicLgvr2M4038/DDZ8dk=; b=y6by+S8T72AQb3I4GQfOrjI/L/AYq0Y0sa4PEhrysXPTLX1/c6yt4JhY7ZIL9zC50m IvwpfQY8BjPoRz1qxirzyhogP5CA+9RRiZJuY5lNCwwZ6VOJgfTig4pBwWqvXbzRfQEA YTSIzz1h15016/efbP4XWPuCFDcGsc8WcZTHHIGrZ3KHbj3+qYm+QEjRx3UkmK1L/abb IfzXm1QQC+j61kPChRfIH60XAF1Cfl+nn56EIYHFNW0lQwPFiI2Jo0rxpBYeYZvM4K2q qOlJSjgIxijhmUHFl2W4VOO29vH2hA3AwnfiZ/oL3qmabnDTDI5LAJZYnj9Sh5HDu/sM mwew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0818 header.b=NpnlqoVt; dkim=pass header.i=@marvell.onmicrosoft.com header.s=selector2-marvell-onmicrosoft-com header.b=MBUDhLvr; 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.50; Wed, 29 May 2019 01:44:50 -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=NpnlqoVt; dkim=pass header.i=@marvell.onmicrosoft.com header.s=selector2-marvell-onmicrosoft-com header.b=MBUDhLvr; 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 S1726857AbfE2Iot (ORCPT + 30 others); Wed, 29 May 2019 04:44:49 -0400 Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]:49564 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726761AbfE2Ioo (ORCPT ); Wed, 29 May 2019 04:44:44 -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 x4T8do5G017769; Wed, 29 May 2019 01:44:37 -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=gH07SKJSQPdDv/5bA0/8ymvQicLgvr2M4038/DDZ8dk=; b=NpnlqoVtiNhoMV9hZdtqNtZoFWalcIzOlI0DeXOsPwiTG7PKZeHw963Hyj/7+vwXGlKs ca96eszuXpU20WeeDxdNKh0WZ75kVVF3eq0u3aDmIXIEgiSnaHoCeVxuumJ2DIeMwjmr cRoBQSmLHKYXN7IdA2O1X2RRewnnPKLSccNq7tj9bnfts7hAAYRvT/pdEpuyOLNgMs7q XB02PBwEN6J8cxlopLLsMxuwlL9UMbHkW/N3NcOZ9pn31lTmy/idW3H8AgQRRP/ZAZjp S3szMRxfkkXJG31rk6ytT6tLXrJ9JsKjO8U8agjT6NaSdoSSTPz9LZyuRxMfmPFCWfna bQ== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0b-0016f401.pphosted.com with ESMTP id 2sskp88p63-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 29 May 2019 01:44:37 -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:35 -0700 Received: from NAM03-CO1-obe.outbound.protection.outlook.com (104.47.40.53) 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:35 -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=gH07SKJSQPdDv/5bA0/8ymvQicLgvr2M4038/DDZ8dk=; b=MBUDhLvrH0U6nacsY/sOssJgeSLvBS9gyLiX+apQxWQVwwkFTR4/yNa1GIrZc7S1Y+euaukS/UX7t0vfdq6NRl/ZrBjyegJqN54pe+yo7Lu8rF98vjJ/+tr1VbxO3KJNNdTdCac1b0kiSj6G+qM4GfMWaDfPO4imPAtS5t1eqD8= 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:31 +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:31 +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 12/21] EDAC, ghes: Add support for legacy API counters Thread-Topic: [PATCH 12/21] EDAC, ghes: Add support for legacy API counters Thread-Index: AQHVFfq76DACswz/0kCLO71UP6WlZA== Date: Wed, 29 May 2019 08:44:30 +0000 Message-ID: <20190529084344.28562-13-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: 48f98d83-122d-4b5f-9855-08d6e411ddcc 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:8273; 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: 9SzTuwoWv3Pxe8JuELv0nAxIYrMSoVIhI6s8ASrtx7oAtTq9hRunlQeQhACxPjf+7HqPuBvNFPmveXQcqQVx3RcUuskRA+lQWIW1bpGkZLUGy5qIsXBq3E5A0DwWO7B6jzetBrFA15v4720636HueMJ5GibrRyM1tMNp3KqAlGeeZBbbeRD8plEFSIF7rJtHRrd89AuaHC5r/+RRnEZk7CTeXqdMneTtFgcc82niifFI1HnfwQXK8KrIfLDxTmuxtINWOaBEaowua3uBR/sMlA8utDtvO0scMqoLTZ7NjEPwqjNovSgizsCSiuZfypkJYXlpcXUf5JcbcciiR48H5iulYTQKGLHBn2vAfRZn0nh+Y0V6SySZo3msDcAm/KA6owmigQLLm5VgjUqAZ0R6/7BGdIEd8EQyoBFMAet1XEU= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 48f98d83-122d-4b5f-9855-08d6e411ddcc X-MS-Exchange-CrossTenant-originalarrivaltime: 29 May 2019 08:44:30.8855 (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 The ghes driver is not able yet to count legacy API counters in sysfs, e.g.: /sys/devices/system/edac/mc/mc0/csrow2/ce_count /sys/devices/system/edac/mc/mc0/csrow2/ch0_ce_count /sys/devices/system/edac/mc/mc0/csrow2/ch1_ce_count Make counting csrows/channels generic so that the ghes driver can use it too. Signed-off-by: Robert Richter --- drivers/edac/edac_mc.c | 39 ++++++++++++++++++++++----------------- drivers/edac/edac_mc.h | 7 ++++++- drivers/edac/ghes_edac.c | 2 +- 3 files changed, 29 insertions(+), 19 deletions(-) -- 2.20.1 diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 8613a31dc86c..f7e6a751f309 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c @@ -1007,7 +1007,8 @@ static void edac_ue_error(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) + struct edac_raw_error_desc *e, + int row, int chan) { char detail[80]; u8 grain_bits; @@ -1040,7 +1041,23 @@ void edac_raw_mc_handle_error(const enum hw_event_mc_err_type type, e->label, detail, e->other_detail); } + /* old API's counters */ + if (dimm) { + row = dimm->csrow; + chan = dimm->cschannel; + } + + if (row >= 0) { + if (type == HW_EVENT_ERR_CORRECTED) { + mci->csrows[row]->ce_count += e->error_count; + if (chan >= 0) + mci->csrows[row]->channels[chan]->ce_count += e->error_count; + } else { + mci->csrows[row]->ue_count += e->error_count; + } + } + edac_dbg(4, "csrow/channel to increment: (%d,%d)\n", row, chan); } EXPORT_SYMBOL_GPL(edac_raw_mc_handle_error); @@ -1171,22 +1188,10 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type, } } - if (!per_layer_report) { + if (!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"); /* Fill the RAM location data */ p = e->location; @@ -1204,6 +1209,6 @@ void edac_mc_handle_error(const enum hw_event_mc_err_type type, dimm = edac_get_dimm(mci, top_layer, mid_layer, low_layer); - edac_raw_mc_handle_error(type, mci, dimm, e); + edac_raw_mc_handle_error(type, mci, dimm, e, row, chan); } EXPORT_SYMBOL_GPL(edac_mc_handle_error); diff --git a/drivers/edac/edac_mc.h b/drivers/edac/edac_mc.h index b816cf3caaee..c4ddd5c1e24c 100644 --- a/drivers/edac/edac_mc.h +++ b/drivers/edac/edac_mc.h @@ -216,6 +216,10 @@ extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci, * @mci: a struct mem_ctl_info pointer * @dimm: a struct dimm_info pointer * @e: error description + * @row: csrow hint if there is no dimm info (<0 if + * unknown) + * @chan: cschannel hint if there is no dimm info (<0 if + * unknown) * * This raw function is used internally by edac_mc_handle_error(). It should * only be called directly when the hardware error come directly from BIOS, @@ -224,7 +228,8 @@ 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); + struct edac_raw_error_desc *e, + int row, int chan); /** * edac_mc_handle_error() - Reports a memory event to userspace. diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c index f6ea4b070bfe..ea4d53043199 100644 --- a/drivers/edac/ghes_edac.c +++ b/drivers/edac/ghes_edac.c @@ -435,7 +435,7 @@ void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err) dimm_info = edac_get_dimm_by_index(mci, e->top_layer); - edac_raw_mc_handle_error(type, mci, dimm_info, e); + edac_raw_mc_handle_error(type, mci, dimm_info, e, -1, -1); spin_unlock_irqrestore(&ghes_lock, flags); }