Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-09-30 16:54:56 +00:00
Code Issues Projects Releases Wiki Activity

sky2: safer transmit timeout

Browse source 
Rather than trying to be "smart" about possible transmit timeout
causes. Just clear all pending frames and reset the PHY.

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-02-06 10:45:42 -08:00 committed by Jeff Garzik
parent 4a50a876ac
commit 62335ab013
1 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
drivers/net/sky2.c
View file

@ -1840,48 +1840,37 @@ out:
} }
/* Transmit timeout is only called if we are running, carries is up /* Transmit timeout is only called if we are running, carrier is up
* and tx queue is full (stopped). * and tx queue is full (stopped).
* Called with netif_tx_lock held.
*/ */
static void sky2_tx_timeout(struct net_device *dev) static void sky2_tx_timeout(struct net_device *dev)
{ {
struct sky2_port *sky2 = netdev_priv(dev); struct sky2_port *sky2 = netdev_priv(dev);
struct sky2_hw *hw = sky2->hw; struct sky2_hw *hw = sky2->hw;
unsigned txq = txqaddr[sky2->port]; u32 imask;
u16 report, done;
if (netif_msg_timer(sky2)) if (netif_msg_timer(sky2))
printk(KERN_ERR PFX "%s: tx timeout\n", dev->name); printk(KERN_ERR PFX "%s: tx timeout\n", dev->name);
report = sky2_read16(hw, sky2->port == 0 ? STAT_TXA1_RIDX : STAT_TXA2_RIDX);
done = sky2_read16(hw, Q_ADDR(txq, Q_DONE));
printk(KERN_DEBUG PFX "%s: transmit ring %u .. %u report=%u done=%u\n", printk(KERN_DEBUG PFX "%s: transmit ring %u .. %u report=%u done=%u\n",
dev->name, dev->name, sky2->tx_cons, sky2->tx_prod,
sky2->tx_cons, sky2->tx_prod, report, done); sky2_read16(hw, sky2->port == 0 ? STAT_TXA1_RIDX : STAT_TXA2_RIDX),
sky2_read16(hw, Q_ADDR(txqaddr[sky2->port], Q_DONE)));
if (report != done) { imask = sky2_read32(hw, B0_IMSK); /* block IRQ in hw */
printk(KERN_INFO PFX "status burst pending (irq moderation?)\n"); sky2_write32(hw, B0_IMSK, 0);
sky2_read32(hw, B0_IMSK);
sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_STOP); netif_poll_disable(hw->dev[0]); /* stop NAPI poll */
sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_START); synchronize_irq(hw->pdev->irq);
} else if (report != sky2->tx_cons) {
printk(KERN_INFO PFX "status report lost?\n");
netif_tx_lock_bh(dev); netif_start_queue(dev); /* don't wakeup during flush */
sky2_tx_complete(sky2, report); sky2_tx_complete(sky2, sky2->tx_prod); /* Flush transmit queue */
netif_tx_unlock_bh(dev);
} else {
printk(KERN_INFO PFX "hardware hung? flushing\n");
sky2_write32(hw, Q_ADDR(txq, Q_CSR), BMU_STOP); sky2_write32(hw, B0_IMSK, imask);
sky2_write32(hw, Y2_QADDR(txq, PREF_UNIT_CTRL), PREF_UNIT_RST_SET);
sky2_tx_clean(dev); sky2_phy_reinit(sky2); /* this clears flow control etc */
sky2_qset(hw, txq);
sky2_prefetch_init(hw, txq, sky2->tx_le_map, TX_RING_SIZE - 1);
}
} }
static int sky2_change_mtu(struct net_device *dev, int new_mtu) static int sky2_change_mtu(struct net_device *dev, int new_mtu)