From: Stephen Hemminger <shemminger@osdl.org>
Date: Mon, 30 Jan 2006 19:37:58 +0000 (-0800)
Subject: [PATCH] sky2: clear irq race
X-Git-Tag: v2.6.16-rc3~139^2~10
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f9a66c7f5fa2262656a1a38ae9b57a2a89980f36;p=linux-2.6-omap-h63xx.git

[PATCH] sky2: clear irq race

Move the interrupt clear to before processing, this avoids a
possible races with status delaying.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
---

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 6cd075e1f38..aff7b9dee38 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1833,6 +1833,8 @@ static int sky2_poll(struct net_device *dev0, int *budget)
 	u16 hwidx;
 	u16 tx_done[2] = { TX_NO_STATUS, TX_NO_STATUS };
 
+	sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ);
+
 	hwidx = sky2_read16(hw, STAT_PUT_IDX);
 	BUG_ON(hwidx >= STATUS_RING_SIZE);
 	rmb();
@@ -1912,12 +1914,10 @@ static int sky2_poll(struct net_device *dev0, int *budget)
 	}
 
 exit_loop:
-	sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ);
-
 	sky2_tx_check(hw, 0, tx_done[0]);
 	sky2_tx_check(hw, 1, tx_done[1]);
 
-	if (sky2_read16(hw, STAT_PUT_IDX) == hw->st_idx) {
+	if (likely(work_done < to_do)) {
 		/* need to restart TX timer */
 		if (is_ec_a1(hw)) {
 			sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_STOP);