edac/85xx: fix error handle of mpc85xx_mc_err_probe

Error handle in case of DDR ECC off is wrong, sysfs entries have not been
created, so edac_mc_free which frees a mci instance should not be called.
Also, free mci's memory in this case.

Signed-off-by: Shaohui Xie <redacted>
---
 drivers/edac/edac_core.h    |    1 +
 drivers/edac/edac_mc.c      |   53 ++++++++++++++++++++++++++++--------------
 drivers/edac/mpc85xx_edac.c |   14 +++++++----
 3 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index 23bb99f..108c4e2 100644
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h

@@ -448,6 +448,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
 				   unsigned sz_pvt);
 extern int edac_mc_add_mc(struct mem_ctl_info *mci);
 extern void edac_mc_free(struct mem_ctl_info *mci);
+extern void edac_mc_free_mem(struct mem_ctl_info *mci);
 extern struct mem_ctl_info *edac_mc_find(int idx);
 extern struct mem_ctl_info *find_mci_by_dev(struct device *dev);
 extern struct mem_ctl_info *edac_mc_del_mc(struct device *dev);

diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 616d90b..a2488b2 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c

@@ -199,6 +199,40 @@ void *edac_align_ptr(void **p, unsigned size, int n_elems)
 	return (void *)(((unsigned long)ptr) + align - r);
 }
 
+/*
+ * edac_mc_free_mem
+ *	'Free' a previously allocated 'mci' memory
+ * @mci: pointer to a struct mem_ctl_info structure
+ */
+void edac_mc_free_mem(struct mem_ctl_info *mci)
+{
+	int i = 0, tot_dimms, chn, tot_channels;
+	struct csrow_info *csr;
+
+	tot_dimms = mci->tot_dimms;
+	tot_channels = mci->num_cschannel;
+
+	if (mci->dimms) {
+		for (i = 0; i < tot_dimms; i++)
+			kfree(mci->dimms[i]);
+		kfree(mci->dimms);
+	}
+	if (mci->csrows) {
+		for (chn = 0; chn < tot_channels; chn++) {
+			csr = mci->csrows[chn];
+			if (csr) {
+				for (chn = 0; chn < tot_channels; chn++)
+					kfree(csr->channels[chn]);
+				kfree(csr);
+			}
+			kfree(mci->csrows[i]);
+		}
+		kfree(mci->csrows);
+	}
+	kfree(mci);
+}
+EXPORT_SYMBOL_GPL(edac_mc_free_mem);
+
 /**
  * edac_mc_alloc: Allocate and partially fill a struct mem_ctl_info structure
  * @mc_num:		Memory controller number

@@ -413,24 +447,7 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
 	return mci;
 
 error:
-	if (mci->dimms) {
-		for (i = 0; i < tot_dimms; i++)
-			kfree(mci->dimms[i]);
-		kfree(mci->dimms);
-	}
-	if (mci->csrows) {
-		for (chn = 0; chn < tot_channels; chn++) {
-			csr = mci->csrows[chn];
-			if (csr) {
-				for (chn = 0; chn < tot_channels; chn++)
-					kfree(csr->channels[chn]);
-				kfree(csr);
-			}
-			kfree(mci->csrows[i]);
-		}
-		kfree(mci->csrows);
-	}
-	kfree(mci);
+	edac_mc_free_mem(mci);
 
 	return NULL;
 }

diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index a1e791e..402b3f5 100644
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c

@@ -1012,7 +1012,7 @@ static int __devinit mpc85xx_mc_err_probe(struct platform_device *op)
 	if (res) {
 		printk(KERN_ERR "%s: Unable to get resource for MC err regs\n",
 		       __func__);
-		goto err;
+		goto err1;
 	}
 
 	if (!devm_request_mem_region(&op->dev, r.start, resource_size(&r),

@@ -1020,14 +1020,14 @@ static int __devinit mpc85xx_mc_err_probe(struct platform_device *op)
 		printk(KERN_ERR "%s: Error while requesting mem region\n",
 		       __func__);
 		res = -EBUSY;
-		goto err;
+		goto err1;
 	}
 
 	pdata->mc_vbase = devm_ioremap(&op->dev, r.start, resource_size(&r));
 	if (!pdata->mc_vbase) {
 		printk(KERN_ERR "%s: Unable to setup MC err regs\n", __func__);
 		res = -ENOMEM;
-		goto err;
+		goto err1;
 	}
 
 	sdram_ctl = in_be32(pdata->mc_vbase + MPC85XX_MC_DDR_SDRAM_CFG);

@@ -1035,7 +1035,7 @@ static int __devinit mpc85xx_mc_err_probe(struct platform_device *op)
 		/* no ECC */
 		printk(KERN_WARNING "%s: No ECC DIMMs discovered\n", __func__);
 		res = -ENODEV;
-		goto err;
+		goto err1;
 	}
 
 	edac_dbg(3, "init mci\n");

@@ -1065,7 +1065,7 @@ static int __devinit mpc85xx_mc_err_probe(struct platform_device *op)
 
 	if (edac_mc_add_mc(mci)) {
 		edac_dbg(3, "failed edac_mc_add_mc()\n");
-		goto err;
+		goto err1;
 	}
 
 	if (mpc85xx_create_sysfs_attributes(mci)) {

@@ -1115,6 +1115,10 @@ err:
 	devres_release_group(&op->dev, mpc85xx_mc_err_probe);
 	edac_mc_free(mci);
 	return res;
+err1:
+	devres_release_group(&op->dev, mpc85xx_mc_err_probe);
+	edac_mc_free_mem(mci);
+	return res;
 }
 
 static int mpc85xx_mc_err_remove(struct platform_device *op)

-- 
1.6.4

On Thu, 13 Sep 2012 18:55:29 +0800
Shaohui Xie [off-list ref] wrote:

Error handle in case of DDR ECC off is wrong, sysfs entries have not been
created, so edac_mc_free which frees a mci instance should not be called.
Also, free mci's memory in this case.

Signed-off-by: Shaohui Xie <redacted>
---

this fixes a 'WARNING: at lib/kobject.c:593' on a p2020, so:

Tested-by: Kim Phillips <redacted>

Kim

On Thu, Sep 13, 2012 at 06:55:29PM +0800, Shaohui Xie wrote:

Error handle in case of DDR ECC off is wrong, sysfs entries have not been
created, so edac_mc_free which frees a mci instance should not be called.
Also, free mci's memory in this case.

Jus FYI: I ran into the same error in edac_mc_free() which I
resolved in a slightly different way in some patches I sent
previously. [1]

[1] https://lkml.org/lkml/2012/9/14/475 

Cheers,
Shaun

-----Original Message-----
From: Shaun Ruffell [mailto:<redacted>]
Sent: Saturday, September 15, 2012 2:22 AM
To: Xie Shaohui-B21989
Cc: <redacted>; <redacted>;
akpm@linux-foundation.org; avorontsov@mvista.com; linux-
kernel@vger.kernel.org; grant.likely@secretlab.ca
Subject: Re: [PATCH] edac/85xx: fix error handle of mpc85xx_mc_err_probe
=20
On Thu, Sep 13, 2012 at 06:55:29PM +0800, Shaohui Xie wrote:

quoted

Error handle in case of DDR ECC off is wrong, sysfs entries have not
been created, so edac_mc_free which frees a mci instance should not be

called.

quoted

Also, free mci's memory in this case.

=20
Jus FYI: I ran into the same error in edac_mc_free() which I resolved in
a slightly different way in some patches I sent previously. [1]
=20
[1] https://lkml.org/lkml/2012/9/14/475

[S.H] Thanks! I did not aware of this patch when one of my colleague asked =
me to have a look at the issue,
It could save me some time if I saw this patch earlier. :(

BTW: seems you are using a different kernel tree with mine.

Best Regards,=20
Shaohui Xie

On Mon, Sep 17, 2012 at 10:32:59AM +0000, Xie Shaohui-B21989 wrote:

quoted

-----Original Message-----
From: Shaun Ruffell [mailto:<redacted>]
Sent: Saturday, September 15, 2012 2:22 AM
To: Xie Shaohui-B21989
Cc: <redacted>; <redacted>;
akpm@linux-foundation.org; avorontsov@mvista.com; linux-
kernel@vger.kernel.org; grant.likely@secretlab.ca
Subject: Re: [PATCH] edac/85xx: fix error handle of mpc85xx_mc_err_probe

On Thu, Sep 13, 2012 at 06:55:29PM +0800, Shaohui Xie wrote:

quoted

Error handle in case of DDR ECC off is wrong, sysfs entries
have not been created, so edac_mc_free which frees a mci
instance should not be called.
Also, free mci's memory in this case.

Jus FYI: I ran into the same error in edac_mc_free() which I
resolved in a slightly different way in some patches I sent
previously. [1]

[1] https://lkml.org/lkml/2012/9/14/475

[S.H] Thanks! I did not aware of this patch when one of my
colleague asked me to have a look at the issue, It could save me
some time if I saw this patch earlier. :(

BTW: seems you are using a different kernel tree with mine.

On the chance that I missing something important: Why do you say I
was running a different kernel tree? I was against 3.6-rc2 when I
original hit the problem.

-----Original Message-----
From: Shaun Ruffell [mailto:<redacted>]
Sent: Wednesday, September 19, 2012 11:05 AM
To: Xie Shaohui-B21989
Cc: <redacted>; <redacted>;
akpm@linux-foundation.org; avorontsov@mvista.com; linux-
kernel@vger.kernel.org; grant.likely@secretlab.ca
Subject: Re: [PATCH] edac/85xx: fix error handle of mpc85xx_mc_err_probe
=20
On Mon, Sep 17, 2012 at 10:32:59AM +0000, Xie Shaohui-B21989 wrote:

quoted

quoted

-----Original Message-----
From: Shaun Ruffell [mailto:<redacted>]
Sent: Saturday, September 15, 2012 2:22 AM
To: Xie Shaohui-B21989
Cc: <redacted>; <redacted>;
akpm@linux-foundation.org; avorontsov@mvista.com; linux-
kernel@vger.kernel.org; grant.likely@secretlab.ca
Subject: Re: [PATCH] edac/85xx: fix error handle of
mpc85xx_mc_err_probe

On Thu, Sep 13, 2012 at 06:55:29PM +0800, Shaohui Xie wrote:

quoted

Error handle in case of DDR ECC off is wrong, sysfs entries have
not been created, so edac_mc_free which frees a mci instance
should not be called.
Also, free mci's memory in this case.

Jus FYI: I ran into the same error in edac_mc_free() which I
resolved in a slightly different way in some patches I sent
previously. [1]

[1] https://lkml.org/lkml/2012/9/14/475

[S.H] Thanks! I did not aware of this patch when one of my colleague
asked me to have a look at the issue, It could save me some time if I
saw this patch earlier. :(

BTW: seems you are using a different kernel tree with mine.

=20
On the chance that I missing something important: Why do you say I was
running a different kernel tree? I was against 3.6-rc2 when I original

1 more quoted lines

[S.H] I'm using 3.6-rc4, and some codes in your patch I did not find them i=
n 3.6-rc4.


Best Regards,=20
Shaohui Xie

On Wed, Sep 19, 2012 at 03:43:35AM +0000, Xie Shaohui-B21989 wrote:

quoted

On Mon, Sep 17, 2012 at 10:32:59AM +0000, Xie Shaohui-B21989 wrote:

quoted

BTW: seems you are using a different kernel tree with mine.

On the chance that I missing something important: Why do you say
I was running a different kernel tree? I was against 3.6-rc2
when I original hit the problem.

[S.H] I'm using 3.6-rc4, and some codes in your patch I did not
find them in 3.6-rc4.

Is it because there were three patches in the series?

  [1/3] https://lkml.org/lkml/2012/9/14/473
  [2/3] https://lkml.org/lkml/2012/9/14/469
  [3/3] https://lkml.org/lkml/2012/9/14/474

They are also the last three commits on my edac_debug_v2 branch
here, which is on top of 3.6-rc6:

https://github.com/sruffell/linux/commits/edac_debug_v2/

Cheers,
Shaun

-----Original Message-----
From: Shaun Ruffell [mailto:<redacted>]
Sent: Wednesday, September 19, 2012 11:53 AM
To: Xie Shaohui-B21989
Cc: <redacted>; <redacted>;
akpm@linux-foundation.org; avorontsov@mvista.com; linux-
kernel@vger.kernel.org; grant.likely@secretlab.ca
Subject: Re: [PATCH] edac/85xx: fix error handle of mpc85xx_mc_err_probe
=20
On Wed, Sep 19, 2012 at 03:43:35AM +0000, Xie Shaohui-B21989 wrote:

quoted

quoted

On Mon, Sep 17, 2012 at 10:32:59AM +0000, Xie Shaohui-B21989 wrote:

quoted

BTW: seems you are using a different kernel tree with mine.

On the chance that I missing something important: Why do you say I
was running a different kernel tree? I was against 3.6-rc2 when I
original hit the problem.

[S.H] I'm using 3.6-rc4, and some codes in your patch I did not find
them in 3.6-rc4.

=20
Is it because there were three patches in the series?
=20
  [1/3] https://lkml.org/lkml/2012/9/14/473
  [2/3] https://lkml.org/lkml/2012/9/14/469
  [3/3] https://lkml.org/lkml/2012/9/14/474
=20
They are also the last three commits on my edac_debug_v2 branch here,
which is on top of 3.6-rc6:
=20
https://github.com/sruffell/linux/commits/edac_debug_v2/

[S.H] Yes.

Best Regards,=20
Shaohui Xie