Patchwork sky2: Avoid races in sky2_down

login
register
mail settings
Submitter Mike McCormack
Date July 12, 2009, 5:28 a.m.
Message ID <392fb48f0907112228v52624339x4f6c418ed0ee07a5@mail.gmail.com>
Download mbox | patch
Permalink /patch/29707/
State Awaiting Upstream
Delegated to: David Miller
Headers show

Comments

Mike McCormack - July 12, 2009, 5:28 a.m.
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(-)
Stephen Hemminger - July 16, 2009, 11:21 p.m.
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>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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