]> err.no Git - linux-2.6/commitdiff
[PATCH] sky2: force early transmit status
authorStephen Hemminger <shemminger@osdl.org>
Wed, 22 Feb 2006 19:45:01 +0000 (11:45 -0800)
committerFrancois Romieu <romieu@fr.zoreil.com>
Thu, 23 Feb 2006 00:25:03 +0000 (01:25 +0100)
Need to force a transmit coalesce timer restart after processing
transmit packets. Otherwise, can get transmit status after last
update and chip doesn't send the next one.

Can go with the chip defaults for coalescing timers, except for
Tx timer which needs to be bigger.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
drivers/net/sky2.c

index 629809433cb38fea64b7e02ff64bdd5c78669b9a..d913d3407e9005331885c832386644282ac03ec5 100644 (file)
@@ -1988,13 +1988,12 @@ exit_loop:
        sky2_tx_check(hw, 0, tx_done[0]);
        sky2_tx_check(hw, 1, tx_done[1]);
 
-       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);
-                       sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_START);
-               }
+       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);
+       }
 
+       if (likely(work_done < to_do)) {
                netif_rx_complete(dev0);
                hw->intr_mask |= Y2_IS_STAT_BMU;
                sky2_write32(hw, B0_IMSK, hw->intr_mask);
@@ -2352,8 +2351,7 @@ static int sky2_reset(struct sky2_hw *hw)
                        sky2_write8(hw, STAT_FIFO_ISR_WM, 16);
 
                sky2_write32(hw, STAT_TX_TIMER_INI, sky2_us2clk(hw, 1000));
-               sky2_write32(hw, STAT_LEV_TIMER_INI, sky2_us2clk(hw, 100));
-               sky2_write32(hw, STAT_ISR_TIMER_INI, sky2_us2clk(hw, 20));
+               sky2_write32(hw, STAT_ISR_TIMER_INI, sky2_us2clk(hw, 7));
        }
 
        /* enable status unit */