diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-07-09 18:33:33 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-07-10 12:22:28 -0400 |
commit | c59697e06058fc2361da8cefcfa3de85ac107582 (patch) | |
tree | fcbfb85875428b329ddae08901e050d90be0a0bb /drivers | |
parent | 71780f59e127bb281a9302d430495ca9586c14e7 (diff) |
sky2: restore workarounds for lost interrupts
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/sky2.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index b51d73c8f817..77abf892e4f3 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -96,7 +96,7 @@ static int disable_msi = 0; | |||
96 | module_param(disable_msi, int, 0); | 96 | module_param(disable_msi, int, 0); |
97 | MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)"); | 97 | MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)"); |
98 | 98 | ||
99 | static int idle_timeout = 0; | 99 | static int idle_timeout = 100; |
100 | module_param(idle_timeout, int, 0); | 100 | module_param(idle_timeout, int, 0); |
101 | MODULE_PARM_DESC(idle_timeout, "Watchdog timer for lost interrupts (ms)"); | 101 | MODULE_PARM_DESC(idle_timeout, "Watchdog timer for lost interrupts (ms)"); |
102 | 102 | ||
@@ -2490,6 +2490,13 @@ static int sky2_poll(struct net_device *dev0, int *budget) | |||
2490 | 2490 | ||
2491 | work_done = sky2_status_intr(hw, work_limit); | 2491 | work_done = sky2_status_intr(hw, work_limit); |
2492 | if (work_done < work_limit) { | 2492 | if (work_done < work_limit) { |
2493 | /* Bug/Errata workaround? | ||
2494 | * Need to kick the TX irq moderation timer. | ||
2495 | */ | ||
2496 | if (sky2_read8(hw, STAT_TX_TIMER_CTRL) == TIM_START) { | ||
2497 | sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_STOP); | ||
2498 | sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_START); | ||
2499 | } | ||
2493 | netif_rx_complete(dev0); | 2500 | netif_rx_complete(dev0); |
2494 | 2501 | ||
2495 | /* end of interrupt, re-enables also acts as I/O synchronization */ | 2502 | /* end of interrupt, re-enables also acts as I/O synchronization */ |