* [PATCH] sky2: Avoid races in sky2_down
@ 2009-06-20 8:02 Mike McCormack
[not found] ` <20090707181807.5b69a926@nehalam>
0 siblings, 1 reply; 5+ messages in thread
From: Mike McCormack @ 2009-06-20 8:02 UTC (permalink / raw)
To: netdev, Stephen Hemminger
Reset rx chain before trying to drain it.
Shut interrupts off last, in case there's something to report.
---
drivers/net/sky2.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index ca1e9e5..3f67a60 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1825,12 +1825,6 @@ static int sky2_down(struct net_device *dev)
if (netif_msg_ifdown(sky2))
printk(KERN_INFO PFX "%s: disabling interface\n", dev->name);
- /* Disable port IRQ */
- imask = sky2_read32(hw, B0_IMSK);
- imask &= ~portirq_msk[port];
- sky2_write32(hw, B0_IMSK, imask);
- sky2_read32(hw, B0_IMSK);
-
/* Force flow control off */
sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
@@ -1870,8 +1864,6 @@ static int sky2_down(struct net_device *dev)
sky2_write32(hw, RB_ADDR(txqaddr[port], RB_CTRL), RB_RST_SET);
- sky2_rx_stop(sky2);
-
sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_SET);
@@ -1881,6 +1873,14 @@ static int sky2_down(struct net_device *dev)
sky2_write32(hw, STAT_ISR_TIMER_CNT, 0);
sky2_read8(hw, STAT_ISR_TIMER_CTRL);
+ sky2_rx_stop(sky2);
+
+ /* Disable port IRQ */
+ imask = sky2_read32(hw, B0_IMSK);
+ imask &= ~portirq_msk[port];
+ sky2_write32(hw, B0_IMSK, imask);
+ sky2_read32(hw, B0_IMSK);
+
synchronize_irq(hw->pdev->irq);
napi_synchronize(&hw->napi);
--
1.5.6.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] sky2: Avoid races in sky2_down
[not found] ` <392fb48f0907072016i14cd650fv3524b345c79e498d@mail.gmail.com>
@ 2009-07-12 5:28 ` Mike McCormack
2009-07-16 23:21 ` Stephen Hemminger
0 siblings, 1 reply; 5+ messages in thread
From: Mike McCormack @ 2009-07-12 5:28 UTC (permalink / raw)
To: netdev, shemminger
Hi Stephen,
Resending with sign off. (You may have this in your tree already, but
just in case...)
I ran some overnight tests with this patch in, and my machine manages
to stay up all night, where it crashed within minutes before.
Mike
---
Reset rx chain before trying to drain it.
Shut interrupts off last, incase there's something to report.
Signed-off-by: Mike McCormack <mikem@ring3k.org>
---
drivers/net/sky2.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index daf961a..23a26d6 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1825,12 +1825,6 @@ static int sky2_down(struct net_device *dev)
if (netif_msg_ifdown(sky2))
printk(KERN_INFO PFX "%s: disabling interface\n", dev->name);
- /* Disable port IRQ */
- imask = sky2_read32(hw, B0_IMSK);
- imask &= ~portirq_msk[port];
- sky2_write32(hw, B0_IMSK, imask);
- sky2_read32(hw, B0_IMSK);
-
/* Force flow control off */
sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
@@ -1870,8 +1864,6 @@ static int sky2_down(struct net_device *dev)
sky2_write32(hw, RB_ADDR(txqaddr[port], RB_CTRL), RB_RST_SET);
- sky2_rx_stop(sky2);
-
sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_SET);
@@ -1881,6 +1873,14 @@ static int sky2_down(struct net_device *dev)
sky2_write32(hw, STAT_ISR_TIMER_CNT, 0);
sky2_read8(hw, STAT_ISR_TIMER_CTRL);
+ sky2_rx_stop(sky2);
+
+ /* Disable port IRQ */
+ imask = sky2_read32(hw, B0_IMSK);
+ imask &= ~portirq_msk[port];
+ sky2_write32(hw, B0_IMSK, imask);
+ sky2_read32(hw, B0_IMSK);
+
synchronize_irq(hw->pdev->irq);
napi_synchronize(&hw->napi);
--
1.5.6.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] sky2: Avoid races in sky2_down
2009-07-12 5:28 ` Mike McCormack
@ 2009-07-16 23:21 ` Stephen Hemminger
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Hemminger @ 2009-07-16 23:21 UTC (permalink / raw)
To: Mike McCormack; +Cc: netdev
On Sun, 12 Jul 2009 14:28:04 +0900
Mike McCormack <mikem@ring3k.org> wrote:
> Hi Stephen,
>
> Resending with sign off. (You may have this in your tree already, but
> just in case...)
> I ran some overnight tests with this patch in, and my machine manages
> to stay up all night, where it crashed within minutes before.
>
> Mike
>
> ---
>
> Reset rx chain before trying to drain it.
> Shut interrupts off last, incase there's something to report.
>
> Signed-off-by: Mike McCormack <mikem@ring3k.org>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] sky2: Avoid races in sky2_down
2009-07-22 0:50 Mike McCormack
@ 2009-07-22 4:00 ` David Miller
0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2009-07-22 4:00 UTC (permalink / raw)
To: mikem; +Cc: netdev
From: Mike McCormack <mikem@ring3k.org>
Date: Wed, 22 Jul 2009 09:50:41 +0900
> Reset rx chain before trying to drain it.
> Shut interrupts off last, incase there's something to report.
>
> Signed-off-by: Mike McCormack <mikem@ring3k.org>
> Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] sky2: Avoid races in sky2_down
@ 2009-07-22 0:50 Mike McCormack
2009-07-22 4:00 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Mike McCormack @ 2009-07-22 0:50 UTC (permalink / raw)
To: netdev
Reset rx chain before trying to drain it.
Shut interrupts off last, incase there's something to report.
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
---
drivers/net/sky2.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index ba768df..3550c5d 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1818,12 +1818,6 @@ static int sky2_down(struct net_device *dev)
if (netif_msg_ifdown(sky2))
printk(KERN_INFO PFX "%s: disabling interface\n", dev->name);
- /* Disable port IRQ */
- imask = sky2_read32(hw, B0_IMSK);
- imask &= ~portirq_msk[port];
- sky2_write32(hw, B0_IMSK, imask);
- sky2_read32(hw, B0_IMSK);
-
/* Force flow control off */
sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
@@ -1863,8 +1857,6 @@ static int sky2_down(struct net_device *dev)
sky2_write32(hw, RB_ADDR(txqaddr[port], RB_CTRL), RB_RST_SET);
- sky2_rx_stop(sky2);
-
sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_SET);
@@ -1874,6 +1866,14 @@ static int sky2_down(struct net_device *dev)
sky2_write32(hw, STAT_ISR_TIMER_CNT, 0);
sky2_read8(hw, STAT_ISR_TIMER_CTRL);
+ sky2_rx_stop(sky2);
+
+ /* Disable port IRQ */
+ imask = sky2_read32(hw, B0_IMSK);
+ imask &= ~portirq_msk[port];
+ sky2_write32(hw, B0_IMSK, imask);
+ sky2_read32(hw, B0_IMSK);
+
synchronize_irq(hw->pdev->irq);
napi_synchronize(&hw->napi);
--
1.5.6.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-07-22 4:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-20 8:02 [PATCH] sky2: Avoid races in sky2_down Mike McCormack
[not found] ` <20090707181807.5b69a926@nehalam>
[not found] ` <392fb48f0907072016i14cd650fv3524b345c79e498d@mail.gmail.com>
2009-07-12 5:28 ` Mike McCormack
2009-07-16 23:21 ` Stephen Hemminger
2009-07-22 0:50 Mike McCormack
2009-07-22 4:00 ` 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.