2016-11-17 02:57:01

by yjin

Subject: [V2 PATCH] edac: mpc85xx: implement "remove" for mpc85xx_pci_err_driver

From: Yanjiang Jin <[email protected]>

Tested on a T4240QDS board.

V1->V2: According to Boris's suggestion, remove all hex addresses and offsets
in Call Trace messages, so that it is recognizable by others.

Yanjiang Jin (1):
edac: mpc85xx: implement "remove" for mpc85xx_pci_err_driver

drivers/edac/mpc85xx_edac.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)

--
1.9.1

2016-11-17 02:57:23

by yjin

Subject: [PATCH] edac: mpc85xx: implement "remove" for mpc85xx_pci_err_driver

From: Yanjiang Jin <[email protected]>

Tested on a T4240QDS board.

If we execute the below steps without this patch:

1. modprobe mpc85xx_edac [The first insmod, everything is well.]
2. modprobe -r mpc85xx_edac
3. modprobe mpc85xx_edac [insmod again, error happens.]

We would get the error messages as below:

BUG: recent printk recursion!
Oops: Kernel access of bad area, sig: 11 [#48]
Modules linked in: mpc85xx_edac edac_core softdog [last unloaded: mpc85xx_edac]
CPU: 5 PID: 14773 Comm: modprobe Tainted: G D C 4.8.3-rt2

.vsnprintf
.vscnprintf
.vprintk_emit
.printk
.edac_pci_add_device
.mpc85xx_pci_err_probe
.platform_drv_probe
.driver_probe_device
.__driver_attach
.bus_for_each_dev
.driver_attach
.bus_add_driver
.driver_register
.__platform_register_drivers
.mpc85xx_mc_init
.do_one_initcall
.do_init_module
.load_module
.SyS_finit_module
system_call

Signed-off-by: Yanjiang Jin <[email protected]>
---
drivers/edac/mpc85xx_edac.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)

diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index ff05675..c626021 100644
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -300,6 +300,22 @@ static int mpc85xx_pci_err_probe(struct platform_device *op)
return res;
}

+static int mpc85xx_pci_err_remove(struct platform_device *op)
+{
+ struct edac_pci_ctl_info *pci = dev_get_drvdata(&op->dev);
+ struct mpc85xx_pci_pdata *pdata = pci->pvt_info;
+
+ edac_dbg(0, "\n");
+
+ out_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_ADDR, orig_pci_err_cap_dr);
+ out_be32(pdata->pci_vbase + MPC85XX_PCI_ERR_EN, orig_pci_err_en);
+
+ edac_pci_del_device(&op->dev);
+ edac_pci_free_ctl_info(pci);
+
+ return 0;
+}
+
static const struct platform_device_id mpc85xx_pci_err_match[] = {
{
.name = "mpc85xx-pci-edac"
@@ -309,6 +325,7 @@ static int mpc85xx_pci_err_probe(struct platform_device *op)

static struct platform_driver mpc85xx_pci_err_driver = {
.probe = mpc85xx_pci_err_probe,
+ .remove = mpc85xx_pci_err_remove,
.id_table = mpc85xx_pci_err_match,
.driver = {
.name = "mpc85xx_pci_err",
--
1.9.1

2016-11-17 10:22:11

by Borislav Petkov

Subject: Re: [PATCH] edac: mpc85xx: implement "remove" for mpc85xx_pci_err_driver

On Thu, Nov 17, 2016 at 10:56:20AM +0800, [email protected] wrote:
> From: Yanjiang Jin <[email protected]>
>
> Tested on a T4240QDS board.
>
> If we execute the below steps without this patch:
>
> 1. modprobe mpc85xx_edac [The first insmod, everything is well.]
> 2. modprobe -r mpc85xx_edac
> 3. modprobe mpc85xx_edac [insmod again, error happens.]
>
> We would get the error messages as below:
>
> BUG: recent printk recursion!
> Oops: Kernel access of bad area, sig: 11 [#48]
> Modules linked in: mpc85xx_edac edac_core softdog [last unloaded: mpc85xx_edac]
> CPU: 5 PID: 14773 Comm: modprobe Tainted: G D C 4.8.3-rt2
>
> .vsnprintf
> .vscnprintf
> .vprintk_emit
> .printk
> .edac_pci_add_device
> .mpc85xx_pci_err_probe
> .platform_drv_probe
> .driver_probe_device
> .__driver_attach
> .bus_for_each_dev
> .driver_attach
> .bus_add_driver
> .driver_register
> .__platform_register_drivers
> .mpc85xx_mc_init
> .do_one_initcall
> .do_init_module
> .load_module
> .SyS_finit_module
> system_call
>
> Signed-off-by: Yanjiang Jin <[email protected]>
> ---
> drivers/edac/mpc85xx_edac.c | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)

Applied, thanks.

--
Regards/Gruss,
Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.