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

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

[PATCH] EDAC: mc numbers refactor 1-of-2 



Remove add_mc_to_global_list().  In next patch, this function will be
reimplemented with different semantics.

1 Reimplement add_mc_to_global_list() with semantics that allow the caller to
  determine the ID number for a mem_ctl_info structure.  Then modify
  edac_mc_add_mc() so that the caller specifies the ID number for the new
  mem_ctl_info structure.  Platform-specific code should be able to assign the
  ID numbers in a platform-specific manner.  For instance, on Opteron it makes
  sense to have the ID of the mem_ctl_info structure match the ID of the node
  that the memory controller belongs to.

2 Modify callers of edac_mc_add_mc() so they use the new semantics.

Signed-off-by: default avatarDoug Thompson <norsk5@xmission.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 37f04581

drivers/edac/amd76x_edac.c

+4 −1
Original line number Diff line number Diff line
@@ -257,7 +257,10 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx) 


	amd76x_get_error_info(mci, &discard);  /* clear counters */



	if (edac_mc_add_mc(mci)) {

	/* 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)) {

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

		goto fail;

	}

drivers/edac/e752x_edac.c

+4 −1
Original line number Diff line number Diff line
@@ -953,7 +953,10 @@ static int e752x_probe1(struct pci_dev *pdev, int dev_idx) 
		"tolm = %x, remapbase = %x, remaplimit = %x\n", pvt->tolm,

		pvt->remapbase, pvt->remaplimit);



	if (edac_mc_add_mc(mci)) {

	/* 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)) {

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

		goto fail;

	}

drivers/edac/e7xxx_edac.c

+4 −1
Original line number Diff line number Diff line
@@ -463,7 +463,10 @@ static int e7xxx_probe1(struct pci_dev *pdev, int dev_idx) 
	/* clear any pending errors, or initial state bits */

	e7xxx_get_error_info(mci, &discard);



	if (edac_mc_add_mc(mci) != 0) {

	/* 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)) {

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

		goto fail;

	}

drivers/edac/edac_mc.c

+30 −29
Original line number Diff line number Diff line
@@ -1632,47 +1632,46 @@ static struct mem_ctl_info *find_mci_by_dev(struct device *dev) 
	return NULL;

}



/* Return 0 on success, 1 on failure.

 * Before calling this function, caller must

 * assign a unique value to mci->mc_idx.

 */

static int add_mc_to_global_list (struct mem_ctl_info *mci)

{

	struct list_head *item, *insert_before;

	struct mem_ctl_info *p;

	int i;



	if (list_empty(&mc_devices)) {

		mci->mc_idx = 0;

	insert_before = &mc_devices;

	} else {

		if (find_mci_by_dev(mci->dev)) {

			edac_printk(KERN_WARNING, EDAC_MC,

				"%s (%s) %s %s already assigned %d\n",

				mci->dev->bus_id, dev_name(mci->dev),

				mci->mod_name, mci->ctl_name,

				mci->mc_idx);

			return 1;

		}



		insert_before = NULL;

		i = 0;

	if (unlikely((p = find_mci_by_dev(mci->dev)) != NULL))

		goto fail0;



	list_for_each(item, &mc_devices) {

		p = list_entry(item, struct mem_ctl_info, link);



			if (p->mc_idx != i) {

		if (p->mc_idx >= mci->mc_idx) {

			if (unlikely(p->mc_idx == mci->mc_idx))

				goto fail1;



			insert_before = item;

			break;

		}



			i++;

		}



		mci->mc_idx = i;



		if (insert_before == NULL)

			insert_before = &mc_devices;

	}



	list_add_tail_rcu(&mci->link, insert_before);

	return 0;



fail0:

	edac_printk(KERN_WARNING, EDAC_MC,

		    "%s (%s) %s %s already assigned %d\n", p->dev->bus_id,

		    dev_name(p->dev), p->mod_name, p->ctl_name, p->mc_idx);

	return 1;



fail1:

	edac_printk(KERN_WARNING, EDAC_MC,

		    "bug in low-level driver: attempt to assign\n"

		    "    duplicate mc_idx %d in %s()\n", p->mc_idx, __func__);

	return 1;

}



static void complete_mc_list_del(struct rcu_head *head)
@@ -1696,6 +1695,7 @@ static void del_mc_from_global_list(struct mem_ctl_info *mci) 
 * edac_mc_add_mc: Insert the 'mci' structure into the mci global list and

 *                 create sysfs entries associated with mci structure

 * @mci: pointer to the mci structure to be added to the list

 * @mc_idx: A unique numeric identifier to be assigned to the 'mci' structure.

 *

 * Return:

 *	0	Success
@@ -1703,9 +1703,10 @@ static void del_mc_from_global_list(struct mem_ctl_info *mci) 
 */



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

int edac_mc_add_mc(struct mem_ctl_info *mci)

int edac_mc_add_mc(struct mem_ctl_info *mci, int mc_idx)

{

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

	mci->mc_idx = mc_idx;

#ifdef CONFIG_EDAC_DEBUG

	if (edac_debug_level >= 3)

		edac_mc_dump_mci(mci);

drivers/edac/edac_mc.h

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ void edac_mc_dump_mci(struct mem_ctl_info *mci); 
void edac_mc_dump_csrow(struct csrow_info *csrow);

#endif  /* CONFIG_EDAC_DEBUG */



extern int edac_mc_add_mc(struct mem_ctl_info *mci);

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);