From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C7DCC18E5A for ; Wed, 11 Mar 2020 09:32:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3859B2146E for ; Wed, 11 Mar 2020 09:32:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cisco.com header.i=@cisco.com header.b="b65If/ln" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728978AbgCKJck (ORCPT ); Wed, 11 Mar 2020 05:32:40 -0400 Received: from alln-iport-2.cisco.com ([173.37.142.89]:4269 "EHLO alln-iport-2.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728349AbgCKJcj (ORCPT ); Wed, 11 Mar 2020 05:32:39 -0400 X-Greylist: delayed 426 seconds by postgrey-1.27 at vger.kernel.org; Wed, 11 Mar 2020 05:32:38 EDT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=@cisco.com; l=4827; q=dns/txt; s=iport; t=1583919159; x=1585128759; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=mms8wLBjHo6Dt51OeTyrv2tcFIK64YI3rRpC7G4yipw=; b=b65If/lnXD/sD1XTUN/UdtKpicPpm0twNBER0i8NPf8FWfTONNh8pb0l bReknmNx+TGfvcFH7dhtLJ5kPh7qAGsss/I2DH4XDGJZo8Ku6/PQcuhy+ dfkeBXDDggNmOcV8KfuzUgMaPRj7/ZLtpIl+OdpqVJ7rbH6P87daOPhs5 I=; X-IronPort-AV: E=Sophos;i="5.70,540,1574121600"; d="scan'208";a="459974795" Received: from rcdn-core-5.cisco.com ([173.37.93.156]) by alln-iport-2.cisco.com with ESMTP/TLS/DHE-RSA-SEED-SHA; 11 Mar 2020 09:25:32 +0000 Received: from sjc-ads-7741.cisco.com (sjc-ads-7741.cisco.com [10.30.222.28]) by rcdn-core-5.cisco.com (8.15.2/8.15.2) with ESMTP id 02B9PWLl022392; Wed, 11 Mar 2020 09:25:32 GMT Received: by sjc-ads-7741.cisco.com (Postfix, from userid 381789) id ED7EB1073; Wed, 11 Mar 2020 02:25:31 -0700 (PDT) From: Manali K Shukla To: bp@alien8.de, linux-edac@vger.kernel.org, mchehab@kernel.org, linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org Cc: xe-linux-external@cisco.com, Borislav Petkov , Aristeu Rozanski Filho , Justin Ernst , Russ Anderson , Tony Luck , Manali K Shukla Subject: [ PATCH stable v4.9] EDAC: Drop per-memory controller buses Date: Wed, 11 Mar 2020 02:24:32 -0700 Message-Id: <20200311092431.29749-1-manashuk@cisco.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Auto-Response-Suppress: DR, OOF, AutoReply X-Outbound-SMTP-Client: 10.30.222.28, sjc-ads-7741.cisco.com X-Outbound-Node: rcdn-core-5.cisco.com Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Borislav Petkov upstream 861e6ed667c83d64a42b0db41a22d6b4de4e913f commit ... and use the single edac_subsys object returned from subsys_system_register(). The idea is to have a single bus and multiple devices on it. Signed-off-by: Borislav Petkov Acked-by: Mauro Carvalho Chehab CC: Aristeu Rozanski Filho CC: Greg KH CC: Justin Ernst CC: linux-edac CC: Mauro Carvalho Chehab CC: Russ Anderson Cc: Tony Luck Link: https://lkml.kernel.org/r/20180926152752.GG5584@zn.tnic [Manali: backport to v4.9 -stable : - removing per-MC bus, this enables to get rid of memory controllers maximum number notion - value of max number of memory controllers is 2 * MAX_NUMNODES. On two nodes system MAX_NUMNODES value is ‘1’ and so value of max number of memory controller becomes ‘2’, this patch fixes this issue when there are only 2 nodes on the system and number of memory controllers are more than ‘2’] (cherry picked from commit 861e6ed667c83d64a42b0db41a22d6b4de4e913f) Signed-off-by: Manali K Shukla --- drivers/edac/edac_mc.c | 9 +-------- drivers/edac/edac_mc_sysfs.c | 30 ++---------------------------- include/linux/edac.h | 6 ------ 3 files changed, 3 insertions(+), 42 deletions(-) diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c index c3ee3ad98a63..ea44c2859b6e 100644 --- a/drivers/edac/edac_mc.c +++ b/drivers/edac/edac_mc.c @@ -50,8 +50,6 @@ static LIST_HEAD(mc_devices); */ static void const *edac_mc_owner; -static struct bus_type mc_bus[EDAC_MAX_MCS]; - unsigned edac_dimm_info_location(struct dimm_info *dimm, char *buf, unsigned len) { @@ -681,11 +679,6 @@ int edac_mc_add_mc_with_groups(struct mem_ctl_info *mci, int ret = -EINVAL; edac_dbg(0, "\n"); - if (mci->mc_idx >= EDAC_MAX_MCS) { - pr_warn_once("Too many memory controllers: %d\n", mci->mc_idx); - return -ENODEV; - } - #ifdef CONFIG_EDAC_DEBUG if (edac_debug_level >= 3) edac_mc_dump_mci(mci); @@ -725,7 +718,7 @@ int edac_mc_add_mc_with_groups(struct mem_ctl_info *mci, /* set load time so that error rate can be tracked */ mci->start_time = jiffies; - mci->bus = &mc_bus[mci->mc_idx]; + mci->bus = edac_get_sysfs_subsys(); if (edac_create_sysfs_mci_device(mci, groups)) { edac_mc_printk(mci, KERN_WARNING, diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c index d59641194860..1bf8283e8bbe 100644 --- a/drivers/edac/edac_mc_sysfs.c +++ b/drivers/edac/edac_mc_sysfs.c @@ -904,27 +904,8 @@ static struct device_type mci_attr_type = { int edac_create_sysfs_mci_device(struct mem_ctl_info *mci, const struct attribute_group **groups) { - char *name; int i, err; - /* - * The memory controller needs its own bus, in order to avoid - * namespace conflicts at /sys/bus/edac. - */ - name = kasprintf(GFP_KERNEL, "mc%d", mci->mc_idx); - if (!name) - return -ENOMEM; - - mci->bus->name = name; - - edac_dbg(0, "creating bus %s\n", mci->bus->name); - - err = bus_register(mci->bus); - if (err < 0) { - kfree(name); - return err; - } - /* get the /sys/devices/system/edac subsys reference */ mci->dev.type = &mci_attr_type; device_initialize(&mci->dev); @@ -940,7 +921,7 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci, err = device_add(&mci->dev); if (err < 0) { edac_dbg(1, "failure: create device %s\n", dev_name(&mci->dev)); - goto fail_unregister_bus; + goto out; } /* @@ -988,10 +969,8 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci, device_unregister(&dimm->dev); } device_unregister(&mci->dev); -fail_unregister_bus: - bus_unregister(mci->bus); - kfree(name); +out: return err; } @@ -1022,13 +1001,8 @@ void edac_remove_sysfs_mci_device(struct mem_ctl_info *mci) void edac_unregister_sysfs(struct mem_ctl_info *mci) { - struct bus_type *bus = mci->bus; - const char *name = mci->bus->name; - edac_dbg(1, "Unregistering device %s\n", dev_name(&mci->dev)); device_unregister(&mci->dev); - bus_unregister(bus); - kfree(name); } static void mc_attr_release(struct device *dev) diff --git a/include/linux/edac.h b/include/linux/edac.h index c6233227720c..f69085294d69 100644 --- a/include/linux/edac.h +++ b/include/linux/edac.h @@ -775,10 +775,4 @@ struct mem_ctl_info { bool fake_inject_ue; u16 fake_inject_count; }; - -/* - * Maximum number of memory controllers in the coherent fabric. - */ -#define EDAC_MAX_MCS 2 * MAX_NUMNODES - #endif -- 2.19.1