* [PATCH v3 1/2 net-next] net: fec: correct fix method about miss init spinlock
@ 2013-02-07 0:59 ` Frank Li
0 siblings, 0 replies; 8+ messages in thread
From: Frank Li @ 2013-02-07 0:59 UTC (permalink / raw)
To: lznuaa, davem, linux-arm-kernel, netdev
Cc: shawn.guo, B38611, s.hauer, Frank Li
Old method will cause init spinlock twice.
New method will avoid init spinlock twice and fix miss init spinlock
at fec_restart.
BUG: spinlock bad magic on CPU#1, swapper/0/1
lock: 0xbfae0f8c, .magic: 00000000, .owner: <none>/-1, .owner_cpu: 0
Backtrace:
[<80011d54>] (dump_backtrace+0x0/0x10c) from [<804e7800>] (dump_stack+0x18/0x1c)
r6:bfae0000 r5:bfae0f8c r4:00000000 r3:806c1310
[<804e77e8>] (dump_stack+0x0/0x1c) from [<804e9f20>] (spin_dump+0x80/0x94)
[<804e9ea0>] (spin_dump+0x0/0x94) from [<804e9f60>] (spin_bug+0x2c/0x30)
r5:805f6f8c r4:bfae0f8c
[<804e9f34>] (spin_bug+0x0/0x30) from [<80257984>] (do_raw_spin_lock+0x170/0x1b0 )
r5:806b4950 r4:bfae0f8c
[<80257814>] (do_raw_spin_lock+0x0/0x1b0) from [<804ed15c>] (_raw_spin_lock_irqs ave+0x18/0x20)
[<804ed144>] (_raw_spin_lock_irqsave+0x0/0x20) from [<8033c694>] (fec_ptp_start_ cyclecounter+0x3c/0x120)
r4:bfae0f8c r3:00000002
[<8033c658>] (fec_ptp_start_cyclecounter+0x0/0x120) from [<80339e08>] (fec_resta rt+0x56c/0x5f8)
r8:00000000 r7:806e6f48 r6:00000112 r5:806b4950 r4:bfae0000
[<8033989c>] (fec_restart+0x0/0x5f8) from [<8033b9e4>] (fec_probe+0x508/0xa48)
Signed-off-by: Frank Li <Frank.Li@freescale.com>
---
Change from v2 to v3.
* rebase to net-next
* revert old fix
Change from v2 to v1.
* avoid reinit hwreg_lock twice
drivers/net/ethernet/freescale/fec.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
index 51215e1..0fe68c4 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@ -1609,7 +1609,6 @@ static int fec_enet_init(struct net_device *ndev)
}
spin_lock_init(&fep->hw_lock);
- spin_lock_init(&fep->tmreg_lock);
fep->netdev = ndev;
@@ -1841,6 +1840,9 @@ fec_probe(struct platform_device *pdev)
fec_reset_phy(pdev);
+ if (fep->bufdesc_ex)
+ fec_ptp_init(ndev, pdev);
+
ret = fec_enet_init(ndev);
if (ret)
goto failed_init;
@@ -1856,9 +1858,6 @@ fec_probe(struct platform_device *pdev)
if (ret)
goto failed_register;
- if (fep->bufdesc_ex)
- fec_ptp_init(ndev, pdev);
-
return 0;
failed_register:
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 1/2 net-next] net: fec: correct fix method about miss init spinlock
@ 2013-02-07 0:59 ` Frank Li
0 siblings, 0 replies; 8+ messages in thread
From: Frank Li @ 2013-02-07 0:59 UTC (permalink / raw)
To: linux-arm-kernel
Old method will cause init spinlock twice.
New method will avoid init spinlock twice and fix miss init spinlock
at fec_restart.
BUG: spinlock bad magic on CPU#1, swapper/0/1
lock: 0xbfae0f8c, .magic: 00000000, .owner: <none>/-1, .owner_cpu: 0
Backtrace:
[<80011d54>] (dump_backtrace+0x0/0x10c) from [<804e7800>] (dump_stack+0x18/0x1c)
r6:bfae0000 r5:bfae0f8c r4:00000000 r3:806c1310
[<804e77e8>] (dump_stack+0x0/0x1c) from [<804e9f20>] (spin_dump+0x80/0x94)
[<804e9ea0>] (spin_dump+0x0/0x94) from [<804e9f60>] (spin_bug+0x2c/0x30)
r5:805f6f8c r4:bfae0f8c
[<804e9f34>] (spin_bug+0x0/0x30) from [<80257984>] (do_raw_spin_lock+0x170/0x1b0 )
r5:806b4950 r4:bfae0f8c
[<80257814>] (do_raw_spin_lock+0x0/0x1b0) from [<804ed15c>] (_raw_spin_lock_irqs ave+0x18/0x20)
[<804ed144>] (_raw_spin_lock_irqsave+0x0/0x20) from [<8033c694>] (fec_ptp_start_ cyclecounter+0x3c/0x120)
r4:bfae0f8c r3:00000002
[<8033c658>] (fec_ptp_start_cyclecounter+0x0/0x120) from [<80339e08>] (fec_resta rt+0x56c/0x5f8)
r8:00000000 r7:806e6f48 r6:00000112 r5:806b4950 r4:bfae0000
[<8033989c>] (fec_restart+0x0/0x5f8) from [<8033b9e4>] (fec_probe+0x508/0xa48)
Signed-off-by: Frank Li <Frank.Li@freescale.com>
---
Change from v2 to v3.
* rebase to net-next
* revert old fix
Change from v2 to v1.
* avoid reinit hwreg_lock twice
drivers/net/ethernet/freescale/fec.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
index 51215e1..0fe68c4 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@ -1609,7 +1609,6 @@ static int fec_enet_init(struct net_device *ndev)
}
spin_lock_init(&fep->hw_lock);
- spin_lock_init(&fep->tmreg_lock);
fep->netdev = ndev;
@@ -1841,6 +1840,9 @@ fec_probe(struct platform_device *pdev)
fec_reset_phy(pdev);
+ if (fep->bufdesc_ex)
+ fec_ptp_init(ndev, pdev);
+
ret = fec_enet_init(ndev);
if (ret)
goto failed_init;
@@ -1856,9 +1858,6 @@ fec_probe(struct platform_device *pdev)
if (ret)
goto failed_register;
- if (fep->bufdesc_ex)
- fec_ptp_init(ndev, pdev);
-
return 0;
failed_register:
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 2/2 net-next] net: fec: fix spin_lock dead lock
2013-02-07 0:59 ` Frank Li
@ 2013-02-07 0:59 ` Frank Li
-1 siblings, 0 replies; 8+ messages in thread
From: Frank Li @ 2013-02-07 0:59 UTC (permalink / raw)
To: lznuaa, davem, linux-arm-kernel, netdev
Cc: shawn.guo, B38611, s.hauer, Frank Li
=========================================================
[ INFO: possible irq lock inversion dependency detected ]
3.8.0-rc5+ #82 Not tainted
---------------------------------------------------------
swapper/0/0 just changed the state of lock:
(&(&fep->hw_lock)->rlock){..-...}, at: [<8034e2f8>] fec_enet_start_xmit+0x48/0x 2cc
but this lock took another, SOFTIRQ-unsafe lock in the past:
(prepare_lock){+.+.+.}
and interrupts could create inverse lock ordering between them.
other info that might help us debug this:
Possible interrupt unsafe locking scenario:
CPU0 CPU1
---- ----
lock(prepare_lock);
local_irq_disable()
lock(&(&fep->hw_lock)->rlock);
lock(prepare_lock);
<Interrupt>
lock(&(&fep->hw_lock)->rlock);
*** DEADLOCK ***
Signed-off-by: Frank Li <Frank.Li@freescale.com>
---
No change from v1 to v3.
drivers/net/ethernet/freescale/fec_ptp.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c
index c40526c..1f17ca0 100644
--- a/drivers/net/ethernet/freescale/fec_ptp.c
+++ b/drivers/net/ethernet/freescale/fec_ptp.c
@@ -104,7 +104,7 @@ void fec_ptp_start_cyclecounter(struct net_device *ndev)
unsigned long flags;
int inc;
- inc = 1000000000 / clk_get_rate(fep->clk_ptp);
+ inc = 1000000000 / fep->cycle_speed;
/* grab the ptp lock */
spin_lock_irqsave(&fep->tmreg_lock, flags);
@@ -363,6 +363,8 @@ void fec_ptp_init(struct net_device *ndev, struct platform_device *pdev)
fep->ptp_caps.settime = fec_ptp_settime;
fep->ptp_caps.enable = fec_ptp_enable;
+ fep->cycle_speed = clk_get_rate(fep->clk_ptp);
+
spin_lock_init(&fep->tmreg_lock);
fec_ptp_start_cyclecounter(ndev);
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v3 2/2 net-next] net: fec: fix spin_lock dead lock
@ 2013-02-07 0:59 ` Frank Li
0 siblings, 0 replies; 8+ messages in thread
From: Frank Li @ 2013-02-07 0:59 UTC (permalink / raw)
To: linux-arm-kernel
=========================================================
[ INFO: possible irq lock inversion dependency detected ]
3.8.0-rc5+ #82 Not tainted
---------------------------------------------------------
swapper/0/0 just changed the state of lock:
(&(&fep->hw_lock)->rlock){..-...}, at: [<8034e2f8>] fec_enet_start_xmit+0x48/0x 2cc
but this lock took another, SOFTIRQ-unsafe lock in the past:
(prepare_lock){+.+.+.}
and interrupts could create inverse lock ordering between them.
other info that might help us debug this:
Possible interrupt unsafe locking scenario:
CPU0 CPU1
---- ----
lock(prepare_lock);
local_irq_disable()
lock(&(&fep->hw_lock)->rlock);
lock(prepare_lock);
<Interrupt>
lock(&(&fep->hw_lock)->rlock);
*** DEADLOCK ***
Signed-off-by: Frank Li <Frank.Li@freescale.com>
---
No change from v1 to v3.
drivers/net/ethernet/freescale/fec_ptp.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c
index c40526c..1f17ca0 100644
--- a/drivers/net/ethernet/freescale/fec_ptp.c
+++ b/drivers/net/ethernet/freescale/fec_ptp.c
@@ -104,7 +104,7 @@ void fec_ptp_start_cyclecounter(struct net_device *ndev)
unsigned long flags;
int inc;
- inc = 1000000000 / clk_get_rate(fep->clk_ptp);
+ inc = 1000000000 / fep->cycle_speed;
/* grab the ptp lock */
spin_lock_irqsave(&fep->tmreg_lock, flags);
@@ -363,6 +363,8 @@ void fec_ptp_init(struct net_device *ndev, struct platform_device *pdev)
fep->ptp_caps.settime = fec_ptp_settime;
fep->ptp_caps.enable = fec_ptp_enable;
+ fep->cycle_speed = clk_get_rate(fep->clk_ptp);
+
spin_lock_init(&fep->tmreg_lock);
fec_ptp_start_cyclecounter(ndev);
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v3 2/2 net-next] net: fec: fix spin_lock dead lock
2013-02-07 0:59 ` Frank Li
@ 2013-02-08 4:37 ` David Miller
-1 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2013-02-08 4:37 UTC (permalink / raw)
To: Frank.Li; +Cc: lznuaa, linux-arm-kernel, netdev, shawn.guo, B38611, s.hauer
From: Frank Li <Frank.Li@freescale.com>
Date: Thu, 7 Feb 2013 08:59:59 +0800
> =========================================================
> [ INFO: possible irq lock inversion dependency detected ]
> 3.8.0-rc5+ #82 Not tainted
> ---------------------------------------------------------
> swapper/0/0 just changed the state of lock:
> (&(&fep->hw_lock)->rlock){..-...}, at: [<8034e2f8>] fec_enet_start_xmit+0x48/0x 2cc
> but this lock took another, SOFTIRQ-unsafe lock in the past:
> (prepare_lock){+.+.+.}
>
> and interrupts could create inverse lock ordering between them.
> other info that might help us debug this:
> Possible interrupt unsafe locking scenario:
>
> CPU0 CPU1
> ---- ----
> lock(prepare_lock);
> local_irq_disable()
> lock(&(&fep->hw_lock)->rlock);
> lock(prepare_lock);
> <Interrupt>
> lock(&(&fep->hw_lock)->rlock);
>
> *** DEADLOCK ***
>
> Signed-off-by: Frank Li <Frank.Li@freescale.com>
Applied.
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH v3 2/2 net-next] net: fec: fix spin_lock dead lock
@ 2013-02-08 4:37 ` David Miller
0 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2013-02-08 4:37 UTC (permalink / raw)
To: linux-arm-kernel
From: Frank Li <Frank.Li@freescale.com>
Date: Thu, 7 Feb 2013 08:59:59 +0800
> =========================================================
> [ INFO: possible irq lock inversion dependency detected ]
> 3.8.0-rc5+ #82 Not tainted
> ---------------------------------------------------------
> swapper/0/0 just changed the state of lock:
> (&(&fep->hw_lock)->rlock){..-...}, at: [<8034e2f8>] fec_enet_start_xmit+0x48/0x 2cc
> but this lock took another, SOFTIRQ-unsafe lock in the past:
> (prepare_lock){+.+.+.}
>
> and interrupts could create inverse lock ordering between them.
> other info that might help us debug this:
> Possible interrupt unsafe locking scenario:
>
> CPU0 CPU1
> ---- ----
> lock(prepare_lock);
> local_irq_disable()
> lock(&(&fep->hw_lock)->rlock);
> lock(prepare_lock);
> <Interrupt>
> lock(&(&fep->hw_lock)->rlock);
>
> *** DEADLOCK ***
>
> Signed-off-by: Frank Li <Frank.Li@freescale.com>
Applied.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3 1/2 net-next] net: fec: correct fix method about miss init spinlock
2013-02-07 0:59 ` Frank Li
@ 2013-02-08 4:36 ` David Miller
-1 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2013-02-08 4:36 UTC (permalink / raw)
To: Frank.Li; +Cc: lznuaa, linux-arm-kernel, netdev, shawn.guo, B38611, s.hauer
From: Frank Li <Frank.Li@freescale.com>
Date: Thu, 7 Feb 2013 08:59:58 +0800
> Old method will cause init spinlock twice.
> New method will avoid init spinlock twice and fix miss init spinlock
> at fec_restart.
...
> Signed-off-by: Frank Li <Frank.Li@freescale.com>
Applied.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 1/2 net-next] net: fec: correct fix method about miss init spinlock
@ 2013-02-08 4:36 ` David Miller
0 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2013-02-08 4:36 UTC (permalink / raw)
To: linux-arm-kernel
From: Frank Li <Frank.Li@freescale.com>
Date: Thu, 7 Feb 2013 08:59:58 +0800
> Old method will cause init spinlock twice.
> New method will avoid init spinlock twice and fix miss init spinlock
> at fec_restart.
...
> Signed-off-by: Frank Li <Frank.Li@freescale.com>
Applied.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-02-08 4:37 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-07 0:59 [PATCH v3 1/2 net-next] net: fec: correct fix method about miss init spinlock Frank Li
2013-02-07 0:59 ` Frank Li
2013-02-07 0:59 ` [PATCH v3 2/2 net-next] net: fec: fix spin_lock dead lock Frank Li
2013-02-07 0:59 ` Frank Li
2013-02-08 4:37 ` David Miller
2013-02-08 4:37 ` David Miller
2013-02-08 4:36 ` [PATCH v3 1/2 net-next] net: fec: correct fix method about miss init spinlock David Miller
2013-02-08 4:36 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.