korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-17 01:04:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] sky2: status interrupt handling improvement

Browse Source 
More changes to prevent losing status and causing hangs.
The hardware is smarter than I gave it credit for.
Clearing the status IRQ causes the status state machine to
toggle an IRQ if needed and post any more transmits.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Stephen Hemminger 2006-08-01 11:55:23 -07:00 committed by Jeff Garzik
parent 834695ee41
commit fe2a24dfc5
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/net/sky2.c
View File

@ -50,7 +50,7 @@
#include "sky2.h"
#define DRV_NAME "sky2"
#define DRV_VERSION "1.5"
#define DRV_VERSION "1.6"
#define PFX DRV_NAME " "
/*
@ -1932,12 +1932,6 @@ static inline void sky2_tx_done(struct net_device *dev, u16 last)
}
}
/* Is status ring empty or is there more to do? */
static inline int sky2_more_work(const struct sky2_hw *hw)
{
return (hw->st_idx != sky2_read16(hw, STAT_PUT_IDX));
}
/* Process status response ring */
static int sky2_status_intr(struct sky2_hw *hw, int to_do)
{
@ -2028,6 +2022,9 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do)
}
}
/* Fully processed status ring so clear irq */
sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ);
exit_loop:
if (buf_write[0]) {
sky2 = netdev_priv(hw->dev[0]);
@ -2237,19 +2234,16 @@ static int sky2_poll(struct net_device *dev0, int *budget)
sky2_descriptor_error(hw, 1, "transmit", Y2_IS_CHK_TXA2);
work_done = sky2_status_intr(hw, work_limit);
*budget -= work_done;
dev0->quota -= work_done;
if (work_done < work_limit) {
netif_rx_complete(dev0);
if (status & Y2_IS_STAT_BMU)
sky2_write32(hw, STAT_CTRL, SC_STAT_CLR_IRQ);
if (sky2_more_work(hw))
sky2_read32(hw, B0_Y2_SP_LISR);
return 0;
} else {
*budget -= work_done;
dev0->quota -= work_done;
return 1;
netif_rx_complete(dev0);
sky2_read32(hw, B0_Y2_SP_LISR);
return 0;
}
}
static irqreturn_t sky2_intr(int irq, void *dev_id, struct pt_regs *regs)