Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-10 15:58:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sky2: restore workarounds for lost interrupts

Browse Source 
This patch restores a couple of workarounds from 2.6.16:
 * restart transmit moderation timer in case it expires during IRQ routine
 * default to having 10 HZ watchdog timer.
At this point it more important not to hang than to worry about the
power cost.

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:33 -07:00 committed by Jeff Garzik
parent 71780f59e1
commit c59697e060
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/sky2.c
View File

@ -96,7 +96,7 @@ static int disable_msi = 0;
module_param(disable_msi, int, 0); module_param(disable_msi, int, 0);
MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)"); MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)");
static int idle_timeout = 0; static int idle_timeout = 100;
module_param(idle_timeout, int, 0); module_param(idle_timeout, int, 0);
MODULE_PARM_DESC(idle_timeout, "Watchdog timer for lost interrupts (ms)"); MODULE_PARM_DESC(idle_timeout, "Watchdog timer for lost interrupts (ms)");
@ -2490,6 +2490,13 @@ static int sky2_poll(struct net_device *dev0, int *budget)
work_done = sky2_status_intr(hw, work_limit); work_done = sky2_status_intr(hw, work_limit);
if (work_done < work_limit) { if (work_done < work_limit) {
/* 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); netif_rx_complete(dev0);
/* end of interrupt, re-enables also acts as I/O synchronization */ /* end of interrupt, re-enables also acts as I/O synchronization */