malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

korina: fix handling tx_chain_tail

Browse Source 
Originally this must have been a rewrite error when introducing
'chain_index'. But the original driver did not use the previous chain
item everywhere: when altering the address tx_chain_tail points to, it
should move forward, not backwards.
Also this is not an "index" but rather the penultimate element in the
chain, so rename it accordingly.

Signed-off-by: Phil Sutter <n0-1@freewrt.org>
Acked-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Phil Sutter 2009-01-14 21:50:41 -08:00 committed by David S. Miller
parent 60d3f9827c
commit 97bc477cbc
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/net/korina.c
View File

@ -199,7 +199,7 @@ static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
struct korina_private *lp = netdev_priv(dev); struct korina_private *lp = netdev_priv(dev);
unsigned long flags; unsigned long flags;
u32 length; u32 length;
u32 chain_index; u32 chain_prev, chain_next;
struct dma_desc *td; struct dma_desc *td;
spin_lock_irqsave(&lp->lock, flags); spin_lock_irqsave(&lp->lock, flags);
@ -231,8 +231,8 @@ static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
/* Setup the transmit descriptor. */ /* Setup the transmit descriptor. */
dma_cache_inv((u32) td, sizeof(*td)); dma_cache_inv((u32) td, sizeof(*td));
td->ca = CPHYSADDR(skb->data); td->ca = CPHYSADDR(skb->data);
chain_index = (lp->tx_chain_tail - 1) & chain_prev = (lp->tx_chain_tail - 1) & KORINA_TDS_MASK;
KORINA_TDS_MASK; chain_next = (lp->tx_chain_tail + 1) & KORINA_TDS_MASK;
if (readl(&(lp->tx_dma_regs->dmandptr)) == 0) { if (readl(&(lp->tx_dma_regs->dmandptr)) == 0) {
if (lp->tx_chain_status == desc_empty) { if (lp->tx_chain_status == desc_empty) {
@ -240,7 +240,7 @@ static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
td->control = DMA_COUNT(length) | td->control = DMA_COUNT(length) |
DMA_DESC_COF | DMA_DESC_IOF; DMA_DESC_COF | DMA_DESC_IOF;
/* Move tail */ /* Move tail */
lp->tx_chain_tail = chain_index; lp->tx_chain_tail = chain_next;
/* Write to NDPTR */ /* Write to NDPTR */
writel(CPHYSADDR(&lp->td_ring[lp->tx_chain_head]), writel(CPHYSADDR(&lp->td_ring[lp->tx_chain_head]),
&lp->tx_dma_regs->dmandptr); &lp->tx_dma_regs->dmandptr);
@ -251,12 +251,12 @@ static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
td->control = DMA_COUNT(length) | td->control = DMA_COUNT(length) |
DMA_DESC_COF | DMA_DESC_IOF; DMA_DESC_COF | DMA_DESC_IOF;
/* Link to prev */ /* Link to prev */
lp->td_ring[chain_index].control &= lp->td_ring[chain_prev].control &=
~DMA_DESC_COF; ~DMA_DESC_COF;
/* Link to prev */ /* Link to prev */
lp->td_ring[chain_index].link = CPHYSADDR(td); lp->td_ring[chain_prev].link = CPHYSADDR(td);
/* Move tail */ /* Move tail */
lp->tx_chain_tail = chain_index; lp->tx_chain_tail = chain_next;
/* Write to NDPTR */ /* Write to NDPTR */
writel(CPHYSADDR(&lp->td_ring[lp->tx_chain_head]), writel(CPHYSADDR(&lp->td_ring[lp->tx_chain_head]),
&(lp->tx_dma_regs->dmandptr)); &(lp->tx_dma_regs->dmandptr));
@ -270,17 +270,17 @@ static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
td->control = DMA_COUNT(length) | td->control = DMA_COUNT(length) |
DMA_DESC_COF | DMA_DESC_IOF; DMA_DESC_COF | DMA_DESC_IOF;
/* Move tail */ /* Move tail */
lp->tx_chain_tail = chain_index; lp->tx_chain_tail = chain_next;
lp->tx_chain_status = desc_filled; lp->tx_chain_status = desc_filled;
netif_stop_queue(dev); netif_stop_queue(dev);
} else { } else {
/* Update tail */ /* Update tail */
td->control = DMA_COUNT(length) | td->control = DMA_COUNT(length) |
DMA_DESC_COF | DMA_DESC_IOF; DMA_DESC_COF | DMA_DESC_IOF;
lp->td_ring[chain_index].control &= lp->td_ring[chain_prev].control &=
~DMA_DESC_COF; ~DMA_DESC_COF;
lp->td_ring[chain_index].link = CPHYSADDR(td); lp->td_ring[chain_prev].link = CPHYSADDR(td);
lp->tx_chain_tail = chain_index; lp->tx_chain_tail = chain_next;
} }
} }
dma_cache_wback((u32) td, sizeof(*td)); dma_cache_wback((u32) td, sizeof(*td));