Skip to content

Commit

Permalink
[PATCH] sky2: clear irq race
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stephen Hemminger authored and Jeff Garzik committed Feb 7, 2006
1 parent a8ab1ec commit f9a66c7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/sky2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit f9a66c7

Please sign in to comment.