mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
3c59x: Add BQL support for 3c59x ethernet driver.
This BQL patch is based on work done by Tino Reichardt. Tested on 0000:05:00.0: 3Com PCI 3c905C Tornado at ffffc90000e6e000 by running Flent several times. Signed-off-by: Loganaden Velvindron <logan@elandsys.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
b17f29646d
commit
4a89ba04ec
1 changed files with 20 additions and 3 deletions
|
@ -1726,6 +1726,7 @@ vortex_up(struct net_device *dev)
|
||||||
if (vp->cb_fn_base) /* The PCMCIA people are idiots. */
|
if (vp->cb_fn_base) /* The PCMCIA people are idiots. */
|
||||||
iowrite32(0x8000, vp->cb_fn_base + 4);
|
iowrite32(0x8000, vp->cb_fn_base + 4);
|
||||||
netif_start_queue (dev);
|
netif_start_queue (dev);
|
||||||
|
netdev_reset_queue(dev);
|
||||||
err_out:
|
err_out:
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
@ -1935,16 +1936,18 @@ static void vortex_tx_timeout(struct net_device *dev)
|
||||||
if (vp->cur_tx - vp->dirty_tx > 0 && ioread32(ioaddr + DownListPtr) == 0)
|
if (vp->cur_tx - vp->dirty_tx > 0 && ioread32(ioaddr + DownListPtr) == 0)
|
||||||
iowrite32(vp->tx_ring_dma + (vp->dirty_tx % TX_RING_SIZE) * sizeof(struct boom_tx_desc),
|
iowrite32(vp->tx_ring_dma + (vp->dirty_tx % TX_RING_SIZE) * sizeof(struct boom_tx_desc),
|
||||||
ioaddr + DownListPtr);
|
ioaddr + DownListPtr);
|
||||||
if (vp->cur_tx - vp->dirty_tx < TX_RING_SIZE)
|
if (vp->cur_tx - vp->dirty_tx < TX_RING_SIZE) {
|
||||||
netif_wake_queue (dev);
|
netif_wake_queue (dev);
|
||||||
|
netdev_reset_queue (dev);
|
||||||
|
}
|
||||||
if (vp->drv_flags & IS_BOOMERANG)
|
if (vp->drv_flags & IS_BOOMERANG)
|
||||||
iowrite8(PKT_BUF_SZ>>8, ioaddr + TxFreeThreshold);
|
iowrite8(PKT_BUF_SZ>>8, ioaddr + TxFreeThreshold);
|
||||||
iowrite16(DownUnstall, ioaddr + EL3_CMD);
|
iowrite16(DownUnstall, ioaddr + EL3_CMD);
|
||||||
} else {
|
} else {
|
||||||
dev->stats.tx_dropped++;
|
dev->stats.tx_dropped++;
|
||||||
netif_wake_queue(dev);
|
netif_wake_queue(dev);
|
||||||
|
netdev_reset_queue(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Issue Tx Enable */
|
/* Issue Tx Enable */
|
||||||
iowrite16(TxEnable, ioaddr + EL3_CMD);
|
iowrite16(TxEnable, ioaddr + EL3_CMD);
|
||||||
dev->trans_start = jiffies; /* prevent tx timeout */
|
dev->trans_start = jiffies; /* prevent tx timeout */
|
||||||
|
@ -2063,6 +2066,7 @@ vortex_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||||
{
|
{
|
||||||
struct vortex_private *vp = netdev_priv(dev);
|
struct vortex_private *vp = netdev_priv(dev);
|
||||||
void __iomem *ioaddr = vp->ioaddr;
|
void __iomem *ioaddr = vp->ioaddr;
|
||||||
|
int skblen = skb->len;
|
||||||
|
|
||||||
/* Put out the doubleword header... */
|
/* Put out the doubleword header... */
|
||||||
iowrite32(skb->len, ioaddr + TX_FIFO);
|
iowrite32(skb->len, ioaddr + TX_FIFO);
|
||||||
|
@ -2094,6 +2098,7 @@ vortex_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
netdev_sent_queue(dev, skblen);
|
||||||
|
|
||||||
/* Clear the Tx status stack. */
|
/* Clear the Tx status stack. */
|
||||||
{
|
{
|
||||||
|
@ -2125,6 +2130,7 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||||
void __iomem *ioaddr = vp->ioaddr;
|
void __iomem *ioaddr = vp->ioaddr;
|
||||||
/* Calculate the next Tx descriptor entry. */
|
/* Calculate the next Tx descriptor entry. */
|
||||||
int entry = vp->cur_tx % TX_RING_SIZE;
|
int entry = vp->cur_tx % TX_RING_SIZE;
|
||||||
|
int skblen = skb->len;
|
||||||
struct boom_tx_desc *prev_entry = &vp->tx_ring[(vp->cur_tx-1) % TX_RING_SIZE];
|
struct boom_tx_desc *prev_entry = &vp->tx_ring[(vp->cur_tx-1) % TX_RING_SIZE];
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
dma_addr_t dma_addr;
|
dma_addr_t dma_addr;
|
||||||
|
@ -2230,6 +2236,8 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||||
}
|
}
|
||||||
|
|
||||||
vp->cur_tx++;
|
vp->cur_tx++;
|
||||||
|
netdev_sent_queue(dev, skblen);
|
||||||
|
|
||||||
if (vp->cur_tx - vp->dirty_tx > TX_RING_SIZE - 1) {
|
if (vp->cur_tx - vp->dirty_tx > TX_RING_SIZE - 1) {
|
||||||
netif_stop_queue (dev);
|
netif_stop_queue (dev);
|
||||||
} else { /* Clear previous interrupt enable. */
|
} else { /* Clear previous interrupt enable. */
|
||||||
|
@ -2267,6 +2275,7 @@ vortex_interrupt(int irq, void *dev_id)
|
||||||
int status;
|
int status;
|
||||||
int work_done = max_interrupt_work;
|
int work_done = max_interrupt_work;
|
||||||
int handled = 0;
|
int handled = 0;
|
||||||
|
unsigned int bytes_compl = 0, pkts_compl = 0;
|
||||||
|
|
||||||
ioaddr = vp->ioaddr;
|
ioaddr = vp->ioaddr;
|
||||||
spin_lock(&vp->lock);
|
spin_lock(&vp->lock);
|
||||||
|
@ -2314,6 +2323,8 @@ vortex_interrupt(int irq, void *dev_id)
|
||||||
if (ioread16(ioaddr + Wn7_MasterStatus) & 0x1000) {
|
if (ioread16(ioaddr + Wn7_MasterStatus) & 0x1000) {
|
||||||
iowrite16(0x1000, ioaddr + Wn7_MasterStatus); /* Ack the event. */
|
iowrite16(0x1000, ioaddr + Wn7_MasterStatus); /* Ack the event. */
|
||||||
pci_unmap_single(VORTEX_PCI(vp), vp->tx_skb_dma, (vp->tx_skb->len + 3) & ~3, PCI_DMA_TODEVICE);
|
pci_unmap_single(VORTEX_PCI(vp), vp->tx_skb_dma, (vp->tx_skb->len + 3) & ~3, PCI_DMA_TODEVICE);
|
||||||
|
pkts_compl++;
|
||||||
|
bytes_compl += vp->tx_skb->len;
|
||||||
dev_kfree_skb_irq(vp->tx_skb); /* Release the transferred buffer */
|
dev_kfree_skb_irq(vp->tx_skb); /* Release the transferred buffer */
|
||||||
if (ioread16(ioaddr + TxFree) > 1536) {
|
if (ioread16(ioaddr + TxFree) > 1536) {
|
||||||
/*
|
/*
|
||||||
|
@ -2358,6 +2369,7 @@ vortex_interrupt(int irq, void *dev_id)
|
||||||
iowrite16(AckIntr | IntReq | IntLatch, ioaddr + EL3_CMD);
|
iowrite16(AckIntr | IntReq | IntLatch, ioaddr + EL3_CMD);
|
||||||
} while ((status = ioread16(ioaddr + EL3_STATUS)) & (IntLatch | RxComplete));
|
} while ((status = ioread16(ioaddr + EL3_STATUS)) & (IntLatch | RxComplete));
|
||||||
|
|
||||||
|
netdev_completed_queue(dev, pkts_compl, bytes_compl);
|
||||||
spin_unlock(&vp->window_lock);
|
spin_unlock(&vp->window_lock);
|
||||||
|
|
||||||
if (vortex_debug > 4)
|
if (vortex_debug > 4)
|
||||||
|
@ -2382,6 +2394,7 @@ boomerang_interrupt(int irq, void *dev_id)
|
||||||
int status;
|
int status;
|
||||||
int work_done = max_interrupt_work;
|
int work_done = max_interrupt_work;
|
||||||
int handled = 0;
|
int handled = 0;
|
||||||
|
unsigned int bytes_compl = 0, pkts_compl = 0;
|
||||||
|
|
||||||
ioaddr = vp->ioaddr;
|
ioaddr = vp->ioaddr;
|
||||||
|
|
||||||
|
@ -2455,6 +2468,8 @@ boomerang_interrupt(int irq, void *dev_id)
|
||||||
pci_unmap_single(VORTEX_PCI(vp),
|
pci_unmap_single(VORTEX_PCI(vp),
|
||||||
le32_to_cpu(vp->tx_ring[entry].addr), skb->len, PCI_DMA_TODEVICE);
|
le32_to_cpu(vp->tx_ring[entry].addr), skb->len, PCI_DMA_TODEVICE);
|
||||||
#endif
|
#endif
|
||||||
|
pkts_compl++;
|
||||||
|
bytes_compl += skb->len;
|
||||||
dev_kfree_skb_irq(skb);
|
dev_kfree_skb_irq(skb);
|
||||||
vp->tx_skbuff[entry] = NULL;
|
vp->tx_skbuff[entry] = NULL;
|
||||||
} else {
|
} else {
|
||||||
|
@ -2495,6 +2510,7 @@ boomerang_interrupt(int irq, void *dev_id)
|
||||||
iowrite32(0x8000, vp->cb_fn_base + 4);
|
iowrite32(0x8000, vp->cb_fn_base + 4);
|
||||||
|
|
||||||
} while ((status = ioread16(ioaddr + EL3_STATUS)) & IntLatch);
|
} while ((status = ioread16(ioaddr + EL3_STATUS)) & IntLatch);
|
||||||
|
netdev_completed_queue(dev, pkts_compl, bytes_compl);
|
||||||
|
|
||||||
if (vortex_debug > 4)
|
if (vortex_debug > 4)
|
||||||
pr_debug("%s: exiting interrupt, status %4.4x.\n",
|
pr_debug("%s: exiting interrupt, status %4.4x.\n",
|
||||||
|
@ -2696,7 +2712,8 @@ vortex_down(struct net_device *dev, int final_down)
|
||||||
struct vortex_private *vp = netdev_priv(dev);
|
struct vortex_private *vp = netdev_priv(dev);
|
||||||
void __iomem *ioaddr = vp->ioaddr;
|
void __iomem *ioaddr = vp->ioaddr;
|
||||||
|
|
||||||
netif_stop_queue (dev);
|
netdev_reset_queue(dev);
|
||||||
|
netif_stop_queue(dev);
|
||||||
|
|
||||||
del_timer_sync(&vp->rx_oom_timer);
|
del_timer_sync(&vp->rx_oom_timer);
|
||||||
del_timer_sync(&vp->timer);
|
del_timer_sync(&vp->timer);
|
||||||
|
|
Loading…
Reference in a new issue