From patchwork Wed May 29 08:44:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Richter X-Patchwork-Id: 165345 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp9580632ili; Wed, 29 May 2019 01:45:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqz18Pat5FEStytoxww4QV/z27txW+tMs17gSzCljrfmWLfHcc7WWEGfBPtVqddLtRwXNzS8 X-Received: by 2002:a63:24c1:: with SMTP id k184mr51208567pgk.120.1559119531473; Wed, 29 May 2019 01:45:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559119531; cv=none; d=google.com; s=arc-20160816; b=NxLyfj7ONukz8JlbOFaD++hjZaEJ8cXik94YPeGmTGWJYCF9bZBGFArbMmzfbRbN2I /j/SqtP1UwjGMeR22/tHxXfUepkNgGiWD9KRgwhS4G4af6v8h01f/gD7dqTXtQUh7EI7 HJBckj2rmdbGfrvrR4TS5FFlEjxYgJC6RXLj42rP70WYu8g674LGSMtDWIV5kUP26sah Zn7za4MKDcSIxAlYGRoRJ5WjUKqs+CuPV3R/YNebRsVwJuMis3v/RINa+bzbmw+4sbXO yAEXTUcUujRl10w6eXJZRZp/iy1oAuy1K+u0fg8gS9qja4GeAW8ZN+TTGCgZGRqNBW0A xyEw== 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=2qhE73MCALD+UUzghC/uvCkk7w4it/MmTxCz/igrhjg=; b=l4bUTDwkLTtMbXy3qKce2LxZ7Ti7orSqfVWSRs0rxwMT5vpXjiej8fjeCAUxi/HMwc oCkho6+ysLpEBCpVvVHRr+WneA+okJEe5KRviIUIPJCi6FLUDFpUc54zDcFWUydjyp58 JVQDk+NPy1OEjlntS3NTQ9OI+tSAcAv1wYUrUp9a5ed4IEZqzhp2p94iQ90wxRgFgWTh xsytGiTRoQNt6NfIx7EDkXLRthd7ZmxQftADi6uUfh6PMQ0OrzoWqqi7ztlTkUcE3lgL lJn26H5QwmbEYwvmAXAEoaeSfuZApTFdv02ydFC4KIdrNw5WV8Kk5DZZB2GzFGCb8fRS wbdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0818 header.b=MQFiK0J1; dkim=pass header.i=@marvell.onmicrosoft.com header.s=selector2-marvell-onmicrosoft-com header.b=qaxnvRMt; 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 c30si444467pje.1.2019.05.29.01.45.31; Wed, 29 May 2019 01:45:31 -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=MQFiK0J1; dkim=pass header.i=@marvell.onmicrosoft.com header.s=selector2-marvell-onmicrosoft-com header.b=qaxnvRMt; 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 S1727057AbfE2Ipa (ORCPT + 30 others); Wed, 29 May 2019 04:45:30 -0400 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:35472 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726806AbfE2Ioq (ORCPT ); Wed, 29 May 2019 04:44:46 -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 x4T8eGUE022567; Wed, 29 May 2019 01:44:39 -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=2qhE73MCALD+UUzghC/uvCkk7w4it/MmTxCz/igrhjg=; b=MQFiK0J12G83ymxlQLuBi8DWVDLZmEmM+vkawEz0Gulbox8J1QVaqv3W3lGTtzDK03Cu gUo0kQTdbFw7rWLSyeOtrJ9N2Q3b+De80OTb9PuwAl/3eKyfQdOYVbTRAmPO1swcBsP7 xMvleNyEwk0kSHFgQZQwqjk3SN0vKh879YcE0btMF4Fq/R20odjxU3auflm4LayI/MQ4 XpLFdTtBy3f4eq3XhPq+qOjnwRzkN/2DJVU4XKvna6ATzWsew1Pq/hs1Ka/zR7o2O2kd y2oR+9yEpcUPEnUx+ZbZqxNzF5uPl2XyfbgTg+8S5uiiC/8u5I74yjsZPzP096Wevfon oA== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0a-0016f401.pphosted.com with ESMTP id 2sspkpg1qn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 29 May 2019 01:44:39 -0700 Received: from SC-EXCH03.marvell.com (10.93.176.83) 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:38 -0700 Received: from NAM03-CO1-obe.outbound.protection.outlook.com (104.47.40.55) 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:38 -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=2qhE73MCALD+UUzghC/uvCkk7w4it/MmTxCz/igrhjg=; b=qaxnvRMtUVY8A/DoD5MCYV4Cyc9MMcoCD1QtzmhKzPuv5+ikvae9/oHfzSaL7T++fjuMpD4kXD+cUcDJq83oEKW6UWLxPWhCooeEc7YimKHnyyCY9bAqLvcTCvjVuxUJ8c1ldXklxupYLuUuNCrkJ03Pg3IAPak2+8+R5CWBGcc= 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:37 +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:37 +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 15/21] EDAC, ghes: Moving code around ghes_edac_register() Thread-Topic: [PATCH 15/21] EDAC, ghes: Moving code around ghes_edac_register() Thread-Index: AQHVFfq/R2KXSNdBLEaBrkIutPx52w== Date: Wed, 29 May 2019 08:44:37 +0000 Message-ID: <20190529084344.28562-16-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: e5b2b118-4deb-40b0-6b46-08d6e411e171 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:4125; 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: fu+e12lgxw4W+o83FcLKU3q7/zUft2ZUCqzYTfjQgjIOqxYndv8kpCFCjJmMAzzGMic3GgfRCxi3F3DSgVOqINc+AG8+Ohi1YlzYQcN9KRD/tnjc/jeCrwpBUWENkIIT8TbXSyQxc198VGUIo1EiqZNrG8ej1yz69vpndPLo3dVi583Ti4Zfj+OcpXXEHqYASmPb5VXASvjTFTOQY7xKOTOd9gPFD21J5vaUZRATGjhcPHNTTT5ii90VOWMCg9cb0LIrvGF8YDc4nybmJgJwhOPL3qx/9tIWVzbh/ecJn6Wk5U7x2F6AOw0Z4KhuOR4wUPVT0hBxRJzAHFRozE7dKIvCtqYAEZhlOdnBijuPP+ACxQmvEqYUsUbv1w6i7IZPvYk/nE+cFAuDLXFlYP9njq3MdlG/avu+0O+fuOFKzhI= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: e5b2b118-4deb-40b0-6b46-08d6e411e171 X-MS-Exchange-CrossTenant-originalarrivaltime: 29 May 2019 08:44:37.0169 (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 This is in preparation of the next patch to make the changes there more visible. Signed-off-by: Robert Richter --- drivers/edac/ghes_edac.c | 97 ++++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 44 deletions(-) -- 2.20.1 diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c index 083452a48b42..c39cdfdfb8db 100644 --- a/drivers/edac/ghes_edac.c +++ b/drivers/edac/ghes_edac.c @@ -645,45 +645,19 @@ static struct acpi_platform_list plat_list[] = { { } /* End */ }; -int ghes_edac_register(struct ghes *ghes, struct device *dev) +static int +ghes_edac_register_one(int nid, struct ghes *ghes, struct device *parent) { - bool fake = false; int rc; struct mem_ctl_info *mci; struct edac_mc_layer layers[1]; - int idx = -1; - - if (IS_ENABLED(CONFIG_X86)) { - /* Check if safe to enable on this system */ - idx = acpi_match_platform_list(plat_list); - if (!force_load && idx < 0) - return -ENODEV; - } else { - idx = 0; - } - - /* - * We have only one logical memory controller to which all DIMMs belong. - */ - if (atomic_inc_return(&ghes_init) > 1) - return 0; - - rc = mem_info_setup(); - if (rc == -EINVAL) { - /* we've got a bogus BIOS */ - fake = true; - rc = mem_info_setup_fake(); - } - if (rc < 0) { - pr_err("Can't allocate memory for DIMM data\n"); - return rc; - } layers[0].type = EDAC_MC_LAYER_ALL_MEM; layers[0].size = mem_info.num_dimm; layers[0].is_virt_csrow = true; - mci = edac_mc_alloc(0, ARRAY_SIZE(layers), layers, sizeof(struct ghes_edac_pvt)); + mci = edac_mc_alloc(nid, ARRAY_SIZE(layers), layers, + sizeof(struct ghes_edac_pvt)); if (!mci) { pr_err("Can't allocate memory for EDAC data\n"); return -ENOMEM; @@ -693,7 +667,7 @@ int ghes_edac_register(struct ghes *ghes, struct device *dev) ghes_pvt->ghes = ghes; ghes_pvt->mci = mci; - mci->pdev = dev; + mci->pdev = parent; mci->mtype_cap = MEM_FLAG_EMPTY; mci->edac_ctl_cap = EDAC_FLAG_NONE; mci->edac_cap = EDAC_FLAG_NONE; @@ -701,19 +675,6 @@ int ghes_edac_register(struct ghes *ghes, struct device *dev) mci->ctl_name = "ghes_edac"; mci->dev_name = "ghes"; - if (fake) { - pr_info("This system has a very crappy BIOS: It doesn't even list the DIMMS.\n"); - pr_info("Its SMBIOS info is wrong. It is doubtful that the error report would\n"); - pr_info("work on such system. Use this driver with caution\n"); - } else if (idx < 0) { - pr_info("This EDAC driver relies on BIOS to enumerate memory and get error reports.\n"); - pr_info("Unfortunately, not all BIOSes reflect the memory layout correctly.\n"); - pr_info("So, the end result of using this driver varies from vendor to vendor.\n"); - pr_info("If you find incorrect reports, please contact your hardware vendor\n"); - pr_info("to correct its BIOS.\n"); - pr_info("This system has %d DIMM sockets.\n", mem_info.num_dimm); - } - mci_add_dimm_info(mci); rc = edac_mc_add_mc(mci); @@ -738,3 +699,51 @@ void ghes_edac_unregister(struct ghes *ghes) kfree(mem_info.dimms); } + +int ghes_edac_register(struct ghes *ghes, struct device *dev) +{ + bool fake = false; + int rc; + int idx = -1; + + if (IS_ENABLED(CONFIG_X86)) { + /* Check if safe to enable on this system */ + idx = acpi_match_platform_list(plat_list); + if (!force_load && idx < 0) + return -ENODEV; + } else { + idx = 0; + } + + /* We have only one ghes instance at a time. */ + if (atomic_inc_return(&ghes_init) > 1) + return 0; + + rc = mem_info_setup(); + if (rc == -EINVAL) { + /* we've got a bogus BIOS */ + fake = true; + rc = mem_info_setup_fake(); + } + if (rc < 0) { + pr_err("Can't allocate memory for DIMM data\n"); + return rc; + } + + if (fake) { + pr_info("This system has a very crappy BIOS: It doesn't even list the DIMMS.\n"); + pr_info("Its SMBIOS info is wrong. It is doubtful that the error report would\n"); + pr_info("work on such system. Use this driver with caution\n"); + } else if (idx < 0) { + pr_info("This EDAC driver relies on BIOS to enumerate memory and get error reports.\n"); + pr_info("Unfortunately, not all BIOSes reflect the memory layout correctly.\n"); + pr_info("So, the end result of using this driver varies from vendor to vendor.\n"); + pr_info("If you find incorrect reports, please contact your hardware vendor\n"); + pr_info("to correct its BIOS.\n"); + pr_info("This system has %d DIMM sockets.\n", mem_info.num_dimm); + } + + rc = ghes_edac_register_one(0, ghes, dev); + + return rc; +}