Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8f6f975 authored by Doug Thompson's avatar Doug Thompson Committed by Linus Torvalds
Browse files

drivers/edac: fix edac_mc init apis 



Refactoring of sysfs code necessitated the refactoring of the edac_mc_alloc()
and edac_mc_add_mc() apis, of moving the index value to the alloc() function.
This patch alters the in tree drivers to utilize this new api signature.

Having the index value performed later created a chicken-and-the-egg issue.
Moving it to the alloc() function allows for creating the necessary sysfs
entries with the proper index number

Cc: Alan Cox alan@lxorguk.ukuu.org.uk
Signed-off-by: default avatarDoug Thompson <dougthompson@xmission.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fd309a9d

drivers/edac/amd76x_edac.c

+2 −2
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx) 
	debugf0("%s()\n", __func__);

	pci_read_config_dword(pdev, AMD76X_ECC_MODE_STATUS, &ems);

	ems_mode = (ems >> 10) & 0x3;

	mci = edac_mc_alloc(0, AMD76X_NR_CSROWS, AMD76X_NR_CHANS);

	mci = edac_mc_alloc(0, AMD76X_NR_CSROWS, AMD76X_NR_CHANS, 0);



	if (mci == NULL) {

		return -ENOMEM;
@@ -263,7 +263,7 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx) 
	/* Here we assume that we will never see multiple instances of this

	 * type of memory controller.  The ID is therefore hardcoded to 0.

	 */

	if (edac_mc_add_mc(mci, 0)) {

	if (edac_mc_add_mc(mci)) {

		debugf3("%s(): failed edac_mc_add_mc()\n", __func__);

		goto fail;

	}

drivers/edac/e752x_edac.c

+2 −2
Original line number Diff line number Diff line
@@ -977,7 +977,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) 
	/* Dual channel = 1, Single channel = 0 */

	drc_chan = dual_channel_active(ddrcsr);



	mci = edac_mc_alloc(sizeof(*pvt), E752X_NR_CSROWS, drc_chan + 1);

	mci = edac_mc_alloc(sizeof(*pvt), E752X_NR_CSROWS, drc_chan + 1, 0);



	if (mci == NULL) {

		return -ENOMEM;
@@ -1035,7 +1035,7 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) 
	/* Here we assume that we will never see multiple instances of this

	 * type of memory controller.  The ID is therefore hardcoded to 0.

	 */

	if (edac_mc_add_mc(mci, 0)) {

	if (edac_mc_add_mc(mci)) {

		debugf3("%s(): failed edac_mc_add_mc()\n", __func__);

		goto fail;

	}

drivers/edac/e7xxx_edac.c

+2 −2
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx) 
	pci_read_config_dword(pdev, E7XXX_DRC, &drc);



	drc_chan = dual_channel_active(drc, dev_idx);

	mci = edac_mc_alloc(sizeof(*pvt), E7XXX_NR_CSROWS, drc_chan + 1);

	mci = edac_mc_alloc(sizeof(*pvt), E7XXX_NR_CSROWS, drc_chan + 1, 0);



	if (mci == NULL)

		return -ENOMEM;
@@ -478,7 +478,7 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx) 
	/* Here we assume that we will never see multiple instances of this

	 * type of memory controller.  The ID is therefore hardcoded to 0.

	 */

	if (edac_mc_add_mc(mci, 0)) {

	if (edac_mc_add_mc(mci)) {

		debugf3("%s(): failed edac_mc_add_mc()\n", __func__);

		goto fail1;

	}

drivers/edac/edac_core.h

+14 −13
Original line number Diff line number Diff line
@@ -765,8 +765,11 @@ static inline void pci_write_bits32(struct pci_dev *pdev, int offset, 


#endif				/* CONFIG_PCI */



extern struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,

					  unsigned nr_chans, int edac_index);

extern int edac_mc_add_mc(struct mem_ctl_info *mci);

extern void edac_mc_free(struct mem_ctl_info *mci);

extern struct mem_ctl_info *edac_mc_find(int idx);

extern int edac_mc_add_mc(struct mem_ctl_info *mci, int mc_idx);

extern struct mem_ctl_info *edac_mc_del_mc(struct device *dev);

extern int edac_mc_find_csrow_by_page(struct mem_ctl_info *mci,

				      unsigned long page);
@@ -803,11 +806,8 @@ extern void edac_mc_handle_fbd_ce(struct mem_ctl_info *mci, unsigned int csrow, 
/*

 * edac_device APIs

 */

extern struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,

					  unsigned nr_chans);

extern void edac_mc_free(struct mem_ctl_info *mci);

extern int edac_device_add_device(struct edac_device_ctl_info *edac_dev,

				  int edac_idx);

				int dev_idx);

extern struct edac_device_ctl_info *edac_device_del_device(struct device *dev);

extern void edac_device_handle_ue(struct edac_device_ctl_info *edac_dev,

				int inst_nr, int block_nr, const char *msg);
@@ -817,19 +817,20 @@ extern void edac_device_handle_ce(struct edac_device_ctl_info *edac_dev, 
/*

 * edac_pci APIs

 */

extern struct edac_pci_ctl_info *edac_pci_alloc_ctl_info(unsigned int sz_pvt, const char

							 *edac_pci_name);

extern struct edac_pci_ctl_info *edac_pci_alloc_ctl_info(unsigned int sz_pvt,

				const char *edac_pci_name);



extern void edac_pci_free_ctl_info(struct edac_pci_ctl_info *pci);



extern void

edac_pci_reset_delay_period(struct edac_pci_ctl_info *pci, unsigned long value);

extern void edac_pci_reset_delay_period(struct edac_pci_ctl_info *pci,

				unsigned long value);



extern int edac_pci_add_device(struct edac_pci_ctl_info *pci, int edac_idx);

extern struct edac_pci_ctl_info *edac_pci_del_device(struct device *dev);



extern struct edac_pci_ctl_info *edac_pci_create_generic_ctl(struct device *dev, const char

							     *mod_name);

extern struct edac_pci_ctl_info *edac_pci_create_generic_ctl(

				struct device *dev,

				const char *mod_name);



extern void edac_pci_release_generic_ctl(struct edac_pci_ctl_info *pci);

extern int edac_pci_create_sysfs(struct edac_pci_ctl_info *pci);

drivers/edac/edac_mc.c

+5 −4
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ void *edac_align_ptr(void *ptr, unsigned size) 
 *	struct mem_ctl_info pointer

 */

struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows,

				unsigned nr_chans)

				unsigned nr_chans, int edac_index)

{

	struct mem_ctl_info *mci;

	struct csrow_info *csi, *csrow;
@@ -159,7 +159,8 @@ struct mem_ctl_info *edac_mc_alloc(unsigned sz_pvt, unsigned nr_csrows, 
	chi = (struct channel_info *)(((char *)mci) + ((unsigned long)chi));

	pvt = sz_pvt ? (((char *)mci) + ((unsigned long)pvt)) : NULL;



	memset(mci, 0, size);	/* clear all fields */

	/* setup index and various internal pointers */

	mci->mc_idx = edac_index;

	mci->csrows = csi;

	mci->pvt_info = pvt;

	mci->nr_csrows = nr_csrows;
@@ -405,10 +406,10 @@ EXPORT_SYMBOL(edac_mc_find); 
 */



/* FIXME - should a warning be printed if no error detection? correction? */

int edac_mc_add_mc(struct mem_ctl_info *mci, int mc_idx)

int edac_mc_add_mc(struct mem_ctl_info *mci)

{

	debugf0("%s()\n", __func__);

	mci->mc_idx = mc_idx;



#ifdef CONFIG_EDAC_DEBUG

	if (edac_debug_level >= 3)

		edac_mc_dump_mci(mci);