EDAC: Drop per-memory controller buses (861e6ed6) · Commits · 戴 / test

drivers/edac/edac_mc.c

+1 −8

Original line number	Diff line number	Diff line
		@@ -55,8 +55,6 @@ static LIST_HEAD(mc_devices);
		*/
		static const char *edac_mc_owner;

		static struct bus_type mc_bus[EDAC_MAX_MCS];

		int edac_get_report_status(void)
		{
		return edac_report;
		@@ -716,11 +714,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);
		@@ -760,7 +753,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,

+2 −28

Original line number	Diff line number	Diff line
		@@ -912,27 +912,8 @@ static const 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);
		@@ -947,7 +928,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;
		}

		/*
		@@ -995,10 +976,8 @@ fail_unregister_dimm:
		device_unregister(&dimm->dev);
		}
		device_unregister(&mci->dev);
		fail_unregister_bus:
		bus_unregister(mci->bus);
		kfree(name);

		out:
		return err;
		}

		@@ -1029,13 +1008,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)

+0 −6

Original line number	Diff line number	Diff line
		@@ -669,10 +669,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