Commit 7ac8bf9b authored by Borislav Petkov's avatar Borislav Petkov
Browse files

EDAC: Carve out debugfs functionality 



... into a separate compilation unit and drop a couple of
CONFIG_EDAC_DEBUG ifdefferies. Rename edac_create_debug_nodes() to
edac_create_debugfs_nodes(), while at it.

No functionality change.

Cc: <linux-edac@vger.kernel.org>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent 1f93e4a9

drivers/edac/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ obj-$(CONFIG_EDAC_MM_EDAC) += edac_core.o 
edac_core-y	:= edac_mc.o edac_device.o edac_mc_sysfs.o

edac_core-y	+= edac_module.o edac_device_sysfs.o



edac_core-$(CONFIG_EDAC_DEBUG)		+= debugfs.o



ifdef CONFIG_PCI

edac_core-y	+= edac_pci.o edac_pci_sysfs.o

endif

drivers/edac/debugfs.c

0 → 100644
+103 −0
Original line number Diff line number Diff line 
#include "edac_module.h"



static struct dentry *edac_debugfs;



static ssize_t edac_fake_inject_write(struct file *file,

				      const char __user *data,

				      size_t count, loff_t *ppos)

{

	struct device *dev = file->private_data;

	struct mem_ctl_info *mci = to_mci(dev);

	static enum hw_event_mc_err_type type;

	u16 errcount = mci->fake_inject_count;



	if (!errcount)

		errcount = 1;



	type = mci->fake_inject_ue ? HW_EVENT_ERR_UNCORRECTED

				   : HW_EVENT_ERR_CORRECTED;



	printk(KERN_DEBUG

	       "Generating %d %s fake error%s to %d.%d.%d to test core handling. NOTE: this won't test the driver-specific decoding logic.\n",

		errcount,

		(type == HW_EVENT_ERR_UNCORRECTED) ? "UE" : "CE",

		errcount > 1 ? "s" : "",

		mci->fake_inject_layer[0],

		mci->fake_inject_layer[1],

		mci->fake_inject_layer[2]

	       );

	edac_mc_handle_error(type, mci, errcount, 0, 0, 0,

			     mci->fake_inject_layer[0],

			     mci->fake_inject_layer[1],

			     mci->fake_inject_layer[2],

			     "FAKE ERROR", "for EDAC testing only");



	return count;

}



static const struct file_operations debug_fake_inject_fops = {

	.open = simple_open,

	.write = edac_fake_inject_write,

	.llseek = generic_file_llseek,

};



int __init edac_debugfs_init(void)

{

	edac_debugfs = debugfs_create_dir("edac", NULL);

	if (IS_ERR(edac_debugfs)) {

		edac_debugfs = NULL;

		return -ENOMEM;

	}

	return 0;

}



void edac_debugfs_exit(void)

{

	debugfs_remove(edac_debugfs);

}



int edac_create_debugfs_nodes(struct mem_ctl_info *mci)

{

	struct dentry *d, *parent;

	char name[80];

	int i;



	if (!edac_debugfs)

		return -ENODEV;



	d = debugfs_create_dir(mci->dev.kobj.name, edac_debugfs);

	if (!d)

		return -ENOMEM;

	parent = d;



	for (i = 0; i < mci->n_layers; i++) {

		sprintf(name, "fake_inject_%s",

			     edac_layer_name[mci->layers[i].type]);

		d = debugfs_create_u8(name, S_IRUGO | S_IWUSR, parent,

				      &mci->fake_inject_layer[i]);

		if (!d)

			goto nomem;

	}



	d = debugfs_create_bool("fake_inject_ue", S_IRUGO | S_IWUSR, parent,

				&mci->fake_inject_ue);

	if (!d)

		goto nomem;



	d = debugfs_create_u16("fake_inject_count", S_IRUGO | S_IWUSR, parent,

				&mci->fake_inject_count);

	if (!d)

		goto nomem;



	d = debugfs_create_file("fake_inject", S_IWUSR, parent,

				&mci->dev,

				&debug_fake_inject_fops);

	if (!d)

		goto nomem;



	mci->debugfs = parent;

	return 0;

nomem:

	debugfs_remove(mci->debugfs);

	return -ENOMEM;

}

drivers/edac/edac_core.h

+2 −0
Original line number Diff line number Diff line
@@ -94,6 +94,8 @@ do { \ 


#define edac_dev_name(dev) (dev)->dev_name



#define to_mci(k) container_of(k, struct mem_ctl_info, dev)



/*

 * The following are the structures to provide for a generic

 * or abstract 'edac_device'. This set of structures and the

drivers/edac/edac_mc_sysfs.c

+1 −109
Original line number Diff line number Diff line
@@ -785,47 +785,6 @@ static ssize_t mci_max_location_show(struct device *dev, 
	return p - data;

}



#ifdef CONFIG_EDAC_DEBUG

static ssize_t edac_fake_inject_write(struct file *file,

				      const char __user *data,

				      size_t count, loff_t *ppos)

{

	struct device *dev = file->private_data;

	struct mem_ctl_info *mci = to_mci(dev);

	static enum hw_event_mc_err_type type;

	u16 errcount = mci->fake_inject_count;



	if (!errcount)

		errcount = 1;



	type = mci->fake_inject_ue ? HW_EVENT_ERR_UNCORRECTED

				   : HW_EVENT_ERR_CORRECTED;



	printk(KERN_DEBUG

	       "Generating %d %s fake error%s to %d.%d.%d to test core handling. NOTE: this won't test the driver-specific decoding logic.\n",

		errcount,

		(type == HW_EVENT_ERR_UNCORRECTED) ? "UE" : "CE",

		errcount > 1 ? "s" : "",

		mci->fake_inject_layer[0],

		mci->fake_inject_layer[1],

		mci->fake_inject_layer[2]

	       );

	edac_mc_handle_error(type, mci, errcount, 0, 0, 0,

			     mci->fake_inject_layer[0],

			     mci->fake_inject_layer[1],

			     mci->fake_inject_layer[2],

			     "FAKE ERROR", "for EDAC testing only");



	return count;

}



static const struct file_operations debug_fake_inject_fops = {

	.open = simple_open,

	.write = edac_fake_inject_write,

	.llseek = generic_file_llseek,

};

#endif



/* default Control file */

static DEVICE_ATTR(reset_counters, S_IWUSR, NULL, mci_reset_counters_store);
@@ -896,71 +855,6 @@ static struct device_type mci_attr_type = { 
	.release	= mci_attr_release,

};



#ifdef CONFIG_EDAC_DEBUG

static struct dentry *edac_debugfs;



int __init edac_debugfs_init(void)

{

	edac_debugfs = debugfs_create_dir("edac", NULL);

	if (IS_ERR(edac_debugfs)) {

		edac_debugfs = NULL;

		return -ENOMEM;

	}

	return 0;

}



void edac_debugfs_exit(void)

{

	debugfs_remove(edac_debugfs);

}



static int edac_create_debug_nodes(struct mem_ctl_info *mci)

{

	struct dentry *d, *parent;

	char name[80];

	int i;



	if (!edac_debugfs)

		return -ENODEV;



	d = debugfs_create_dir(mci->dev.kobj.name, edac_debugfs);

	if (!d)

		return -ENOMEM;

	parent = d;



	for (i = 0; i < mci->n_layers; i++) {

		sprintf(name, "fake_inject_%s",

			     edac_layer_name[mci->layers[i].type]);

		d = debugfs_create_u8(name, S_IRUGO | S_IWUSR, parent,

				      &mci->fake_inject_layer[i]);

		if (!d)

			goto nomem;

	}



	d = debugfs_create_bool("fake_inject_ue", S_IRUGO | S_IWUSR, parent,

				&mci->fake_inject_ue);

	if (!d)

		goto nomem;



	d = debugfs_create_u16("fake_inject_count", S_IRUGO | S_IWUSR, parent,

				&mci->fake_inject_count);

	if (!d)

		goto nomem;



	d = debugfs_create_file("fake_inject", S_IWUSR, parent,

				&mci->dev,

				&debug_fake_inject_fops);

	if (!d)

		goto nomem;



	mci->debugfs = parent;

	return 0;

nomem:

	debugfs_remove(mci->debugfs);

	return -ENOMEM;

}

#endif



/*

 * Create a new Memory Controller kobject instance,

 *	mc<id> under the 'mc' directory
@@ -1039,9 +933,7 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci, 
		goto fail_unregister_dimm;

#endif



#ifdef CONFIG_EDAC_DEBUG

	edac_create_debug_nodes(mci);

#endif

	edac_create_debugfs_nodes(mci);

	return 0;



fail_unregister_dimm:

drivers/edac/edac_module.h

+2 −0
Original line number Diff line number Diff line
@@ -63,12 +63,14 @@ extern void *edac_align_ptr(void **p, unsigned size, int n_elems); 
#ifdef CONFIG_EDAC_DEBUG

int edac_debugfs_init(void);

void edac_debugfs_exit(void);

int edac_create_debugfs_nodes(struct mem_ctl_info *mci);

#else

static inline int edac_debugfs_init(void)

{

	return -ENODEV;

}

static inline void edac_debugfs_exit(void) {}

static inline int edac_create_debugfs_nodes(struct mem_ctl_info *mci) { return 0; }

#endif



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE