leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sky2: check for more work before leaving NAPI

Browse Source 
This patch avoids generating another IRQ if more packets
arrive while in the NAPI poll routine. Before marking device as
finished, it rechecks that the status ring is empty.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Stephen Hemminger 2007-07-09 15:33:36 -07:00 committed by Jeff Garzik
parent 3cf267539f
commit 5c11ce700f
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/net/sky2.c
View File

@ -2477,8 +2477,7 @@ static void sky2_err_intr(struct sky2_hw *hw, u32 status)
static int sky2_poll(struct net_device *dev0, int *budget) static int sky2_poll(struct net_device *dev0, int *budget)
{ {
struct sky2_hw *hw = ((struct sky2_port *) netdev_priv(dev0))->hw; struct sky2_hw *hw = ((struct sky2_port *) netdev_priv(dev0))->hw;
int work_limit = min(dev0->quota, *budget); int work_done;
int work_done = 0;
u32 status = sky2_read32(hw, B0_Y2_SP_EISR); u32 status = sky2_read32(hw, B0_Y2_SP_EISR);
if (unlikely(status & Y2_IS_ERROR)) if (unlikely(status & Y2_IS_ERROR))
@ -2490,25 +2489,25 @@ static int sky2_poll(struct net_device *dev0, int *budget)
if (status & Y2_IS_IRQ_PHY2) if (status & Y2_IS_IRQ_PHY2)
sky2_phy_intr(hw, 1); sky2_phy_intr(hw, 1);
work_done = sky2_status_intr(hw, work_limit); work_done = sky2_status_intr(hw, min(dev0->quota, *budget));
if (work_done < work_limit) { *budget -= work_done;
/* Bug/Errata workaround? dev0->quota -= work_done;
* Need to kick the TX irq moderation timer.
*/
if (sky2_read8(hw, STAT_TX_TIMER_CTRL) == TIM_START) {
sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_STOP);
sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_START);
}
netif_rx_complete(dev0);
/* end of interrupt, re-enables also acts as I/O synchronization */ /* More work? */
sky2_read32(hw, B0_Y2_SP_LISR); if (hw->st_idx != sky2_read16(hw, STAT_PUT_IDX))
return 0;
} else {
*budget -= work_done;
dev0->quota -= work_done;
return 1; return 1;
/* Bug/Errata workaround?
* Need to kick the TX irq moderation timer.
*/
if (sky2_read8(hw, STAT_TX_TIMER_CTRL) == TIM_START) {
sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_STOP);
sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_START);
} }
netif_rx_complete(dev0);
sky2_read32(hw, B0_Y2_SP_LISR);
return 0;
} }
static irqreturn_t sky2_intr(int irq, void *dev_id) static irqreturn_t sky2_intr(int irq, void *dev_id)