From patchwork Thu Dec 5 09:38:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Richter X-Patchwork-Id: 180868 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp1728070ile; Thu, 5 Dec 2019 01:38:25 -0800 (PST) X-Google-Smtp-Source: APXvYqzs0OIcn84MRUMiOdcoULY/vNn4XG1F8xkLS7dia7h66dEt8ug44Qo0a70SoyIF1hLZ12Er X-Received: by 2002:aca:4c87:: with SMTP id z129mr6612124oia.72.1575538705152; Thu, 05 Dec 2019 01:38:25 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1575538705; cv=pass; d=google.com; s=arc-20160816; b=D41YZx6gTjyueoNrjajlFmkEWDw2PelKXXoQ9ExvQwrbWn4ItIASnPCC+Ech8FjxOR NgQg04G54x6bXHYAiIsiUloz7FW3XDWAGc6Wbk/wUAD8z7eMIdH2sKIEixVflp37Vgau SugEgkgFGcC3dSzmlOPr6Wsl4XBs/5lQD2NUHLv66+VMer0sFGI59A+d5jXCjg7W4seW d3oQUaeNwTA/6JLvec6hkc38mPN4FgJVTC15jTQRJr1V7qb2LkICJlWEs1JkSBYgEChr qbiXD+ORKEinOSiepqMm/kXLqXkWZXvXncxSXts1KYWkjk4UTE/0yBltXn7jk6fwg+Os rgnQ== 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=g1gwTQlHy1wvorIqQq7F4OyXokTTiOv4CbtXHcDzafA=; b=vcLGwHIsjsNkGrH2nLpuDuDvk4bIDrgkGq3n6W+HmyJna/PwYj4iusi56jAp6ahI7n KZ3VaXAPHgHjzY0HfinjIc3Osv9QhEPjOWOCMXRi45O/6HJTSaVl1B1F3ZRI6Xj5Dqwx ycewGPTSr91T45u37WxJUw6y5jQAXCFnovlp+vBm5b9GgVkS4TZrlAQfj6K+bWMKIf5/ Szcrvov/68OUWKzBfLD0+F9FBaBl/TkKAT/WQrzHcXpq3Z19vUrWla3El/sGPhb2Ixyd l6Hhdc4Ox5XNB0oom/RDG5rp8ganB6Ca7Xhdf4GuJHhoteeBU8RqCFwrFFCVf3eVTDXY ugNA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0818 header.b=CQgLC1Z1; dkim=pass header.i=@marvell.onmicrosoft.com header.s=selector1-marvell-onmicrosoft-com header.b=fCxh3ASJ; 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 u12si553455otq.51.2019.12.05.01.38.24; Thu, 05 Dec 2019 01:38:25 -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=CQgLC1Z1; dkim=pass header.i=@marvell.onmicrosoft.com header.s=selector1-marvell-onmicrosoft-com header.b=fCxh3ASJ; 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 S1729324AbfLEJiY (ORCPT + 27 others); Thu, 5 Dec 2019 04:38:24 -0500 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:28908 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729215AbfLEJiU (ORCPT ); Thu, 5 Dec 2019 04:38:20 -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 xB59bKkX023619; Thu, 5 Dec 2019 01:38:14 -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=g1gwTQlHy1wvorIqQq7F4OyXokTTiOv4CbtXHcDzafA=; b=CQgLC1Z1oQlVIlJ01pxwoy828QyKLYKAylkHYgTfoXmLPVS8+/61Izllg/0W6X5lfWw6 fF5b4KOM2IaSmP0QSp92RbBnds2FxHdPRoaKUcHmpTaSbfiYPAWiUj9rryRLoBdHxOPr IYRRgy/1k4rEV7AYnLYbgWhYTg8PHhoSwGTGLoHHLHZFuxrDLeL0VrkOPo4IkYQFHSkA RINrCdX9oIu1b+CUf7f0KkL7MQoiBJcXc5xUN2EI+hR6soDKFlJ2CD9d4MdfK4bNawyb IZNg8ZgzERFPiaik3WLS+QvV4l/98/spvh+iIyrLKWhGnyrV+qmX7gjn2Zp6oypWXUHn Hw== Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0a-0016f401.pphosted.com with ESMTP id 2wnvgvrd0d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 05 Dec 2019 01:38:14 -0800 Received: from SC-EXCH01.marvell.com (10.93.176.81) 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:13 -0800 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (104.47.38.55) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1367.3 via Frontend Transport; Thu, 5 Dec 2019 01:38:13 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=grE8DqRqU3Kjt5UjHtMoUMGVlS+7Ve20YONTN35vP4KyEgw4EnaL1c2V2kS5vKgKJLoPurD5rODb7ZApGzYynDZLi/PrzTFIh7Zx9F8GCwr6Z0b2BetowOunrBvK+15CGNvlQhQLJ00uXvMAAABiG4WIMKgcnOATg0dL/p967+rZYwl0XoctglosaeU8zcmU+8ds+8K+KFuezbdgwQSevU1zUWICmJ1uCLKzUb6RLwes3bc3zap8+Lypb1bCL3lShHmNNiFomi+2OrDwfB//FgtPzs0xrSPY4m9QDKXc/OBhz5yPwuAIpfd3OQgnP++zQyd5E1LmXGhvOWvsksCgOA== 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=g1gwTQlHy1wvorIqQq7F4OyXokTTiOv4CbtXHcDzafA=; b=jteOIAGzjf75TM11eMQ0XpvQIKJPthlzrEE8/H8+w0fd3FQ09bcHUD+60Ks+AZ3ITKkybHoBXK0jQvp6c8kNxo3o7ALmYURcrrVdG0W0lAQAO1Sso3wwgtuEvNaIh9X9235IXRPoejGVzo67ozfDNmBxESx5mPoEUiVPDsfsGcHITH/pXl8DFyEeNUlBKpFwK2zYWw9vIY+NN1o1jZvIjezmq7x4doFftwO+M0N4G03C8RYRT+kkubFtkZc4RMYC3k3MsrkfRU7PgXFfQ4tXuc8AptA45vj9t18WnVtfx01F1Gb96/kUu+DCv1mOB4umJCsGi24/Nmj5rvHQbpn47g== 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=g1gwTQlHy1wvorIqQq7F4OyXokTTiOv4CbtXHcDzafA=; b=fCxh3ASJggNODLU3qmWtSyidtdkQY4hRRI88Skrfw1pltOAA8PPh91D+VN/xkqya1P+5IeG8BbbdKX3pNK8pTQFtKybZR7P/VqYRgorbdLW7U1gqEuC7QEj3s2hS6RlMqYoxEeQHrVmhlBXoN5OHHUAxmky+LKY+t/8uTfARnjI= 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:12 +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:12 +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 08/10] EDAC/mc: Pass the error descriptor to error reporting functions Thread-Topic: [PATCH v2 08/10] EDAC/mc: Pass the error descriptor to error reporting functions Thread-Index: AQHVq0+2OTakJ7xVJkC7+Ue06c1H3A== Date: Thu, 5 Dec 2019 09:38:12 +0000 Message-ID: <20191205093739.4040-9-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: beb199b4-2e73-41ac-756c-08d77966d880 x-ms-traffictypediagnostic: MN2PR18MB2367: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:439; x-forefront-prvs: 02426D11FE x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(39860400002)(376002)(136003)(346002)(366004)(396003)(189003)(199004)(81166006)(14444005)(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: 8/M1II7M38QDMYpxfzJRyXY7NePHULMpYSIr9J8QS7cD8vE1Fb+swwd5su0JqGmxGej+R9Baa8i0a97vd0kZO4Wa4iBNa2YllcaN0A/BogoV1lbSlBdD5ca4TMzzScQIL0yNQ8wtWCvefuM3K5fr8PvS62Mt/S3dX3kP0Pj9hXSxP87yMwCyrE+jM/krGSNuN8Xf0kMyuob8mvYt5R40rd9KZm107lSmRH0lkxBKYfir2dVCwoLgLLzQ0VxJHupDk6bmiVfWR8MrWVX6jHgPLxtGhSc/pbb0CtbsYxcpq2P0+cKnEgJtRwg5trwPg4DFu71gAXRnjQfnKA3J0JR3WQcUJEK+5BkRkBM78WuyZ0AVqWB3qI4EM7AMvGxhciaD+LoGU9DsCb0+WIVgSNixxopoQtxSRnjAE6X4OchOwi9dJ4Xvf62F12OS22EFkb+9 MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: beb199b4-2e73-41ac-756c-08d77966d880 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Dec 2019 09:38:12.4215 (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: J4okMD5BVnaqBXz7RDBHjrr9WrPsx5TLnrwOfgjsQAQjhXrZOjyyA2Bmjzu2Rfji70cXflc3LfXuZYX65lC6RA== 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 Most arguments of error reporting functions are already stored in struct edac_raw_error_desc error descriptor. Pass the error descriptor to the functions and reduce the functions' arg list. Signed-off-by: Robert Richter --- drivers/edac/edac_mc.c | 100 +++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 58 deletions(-) -- 2.20.1 diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index 38a9a68eebfe..545d25c8654e 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c @@ -945,16 +945,16 @@ 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], - const u16 count) +static void edac_inc_ce_error(struct edac_raw_error_desc *e) { + struct mem_ctl_info *mci = error_desc_to_mci(e); + int pos[EDAC_MAX_LAYERS] = { e->top_layer, e->mid_layer, e->low_layer }; int i, index = 0; - mci->ce_mc += count; + mci->ce_mc += e->error_count; if (pos[0] < 0) { - mci->ce_noinfo_count += count; + mci->ce_noinfo_count += e->error_count; return; } @@ -962,23 +962,23 @@ static void edac_inc_ce_error(struct mem_ctl_info *mci, if (pos[i] < 0) break; index += pos[i]; - mci->ce_per_layer[i][index] += count; + mci->ce_per_layer[i][index] += e->error_count; if (i < mci->n_layers - 1) index *= mci->layers[i + 1].size; } } -static void edac_inc_ue_error(struct mem_ctl_info *mci, - const int pos[EDAC_MAX_LAYERS], - const u16 count) +static void edac_inc_ue_error(struct edac_raw_error_desc *e) { + struct mem_ctl_info *mci = error_desc_to_mci(e); + int pos[EDAC_MAX_LAYERS] = { e->top_layer, e->mid_layer, e->low_layer }; int i, index = 0; - mci->ue_mc += count; + mci->ue_mc += e->error_count; if (pos[0] < 0) { - mci->ue_noinfo_count += count; + mci->ue_noinfo_count += e->error_count; return; } @@ -986,44 +986,37 @@ static void edac_inc_ue_error(struct mem_ctl_info *mci, if (pos[i] < 0) break; index += pos[i]; - mci->ue_per_layer[i][index] += count; + mci->ue_per_layer[i][index] += e->error_count; if (i < mci->n_layers - 1) index *= mci->layers[i + 1].size; } } -static void edac_ce_error(struct mem_ctl_info *mci, - const u16 error_count, - const int pos[EDAC_MAX_LAYERS], - const char *msg, - const char *location, - const char *label, - const char *detail, - const char *other_detail, - const unsigned long page_frame_number, - const unsigned long offset_in_page, - long grain) +static void edac_ce_error(struct edac_raw_error_desc *e, + const char *detail) { + struct mem_ctl_info *mci = error_desc_to_mci(e); unsigned long remapped_page; char *msg_aux = ""; - if (*msg) + if (*e->msg) msg_aux = " "; if (edac_mc_get_log_ce()) { - if (other_detail && *other_detail) + if (e->other_detail && *e->other_detail) edac_mc_printk(mci, KERN_WARNING, "%d CE %s%son %s (%s %s - %s)\n", - error_count, msg, msg_aux, label, - location, detail, other_detail); + e->error_count, e->msg, msg_aux, e->label, + e->location, detail, e->other_detail); else edac_mc_printk(mci, KERN_WARNING, "%d CE %s%son %s (%s %s)\n", - error_count, msg, msg_aux, label, - location, detail); + e->error_count, e->msg, msg_aux, e->label, + e->location, detail); } - edac_inc_ce_error(mci, pos, error_count); + + edac_inc_ce_error(e); if (mci->scrub_mode == SCRUB_SW_SRC) { /* @@ -1038,51 +1031,46 @@ static void edac_ce_error(struct mem_ctl_info *mci, * be scrubbed. */ remapped_page = mci->ctl_page_to_phys ? - mci->ctl_page_to_phys(mci, page_frame_number) : - page_frame_number; + mci->ctl_page_to_phys(mci, e->page_frame_number) : + e->page_frame_number; - edac_mc_scrub_block(remapped_page, - offset_in_page, grain); + edac_mc_scrub_block(remapped_page, e->offset_in_page, e->grain); } } -static void edac_ue_error(struct mem_ctl_info *mci, - const u16 error_count, - const int pos[EDAC_MAX_LAYERS], - const char *msg, - const char *location, - const char *label, - const char *detail, - const char *other_detail) +static void edac_ue_error(struct edac_raw_error_desc *e, + const char *detail) { + struct mem_ctl_info *mci = error_desc_to_mci(e); char *msg_aux = ""; - if (*msg) + if (*e->msg) msg_aux = " "; if (edac_mc_get_log_ue()) { - if (other_detail && *other_detail) + if (e->other_detail && *e->other_detail) edac_mc_printk(mci, KERN_WARNING, "%d UE %s%son %s (%s %s - %s)\n", - error_count, msg, msg_aux, label, - location, detail, other_detail); + e->error_count, e->msg, msg_aux, e->label, + e->location, detail, e->other_detail); else edac_mc_printk(mci, KERN_WARNING, "%d UE %s%son %s (%s %s)\n", - error_count, msg, msg_aux, label, - location, detail); + e->error_count, e->msg, msg_aux, e->label, + e->location, detail); } if (edac_mc_get_panic_on_ue()) { - if (other_detail && *other_detail) + if (e->other_detail && *e->other_detail) panic("UE %s%son %s (%s%s - %s)\n", - msg, msg_aux, label, location, detail, other_detail); + e->msg, msg_aux, e->label, e->location, detail, + e->other_detail); else panic("UE %s%son %s (%s%s)\n", - msg, msg_aux, label, location, detail); + e->msg, msg_aux, e->label, e->location, detail); } - edac_inc_ue_error(mci, pos, error_count); + edac_inc_ue_error(e); } static void edac_inc_csrow(struct edac_raw_error_desc *e, int row, int chan) @@ -1109,7 +1097,6 @@ void edac_raw_mc_handle_error(struct edac_raw_error_desc *e) { struct mem_ctl_info *mci = error_desc_to_mci(e); char detail[80]; - int pos[EDAC_MAX_LAYERS] = { e->top_layer, e->mid_layer, e->low_layer }; u8 grain_bits; /* Sanity-check driver-supplied grain value. */ @@ -1132,16 +1119,13 @@ void edac_raw_mc_handle_error(struct edac_raw_error_desc *e) "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, - e->label, detail, e->other_detail, - e->page_frame_number, e->offset_in_page, e->grain); + edac_ce_error(e, detail); } else { snprintf(detail, sizeof(detail), "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, - e->label, detail, e->other_detail); + edac_ue_error(e, detail); }