hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hopefully fixes dma issues seen on ethernet driver when under high load 

SVN-Revision: 18203
lede-17.01
John Crispin 2009-10-29 12:51:45 +00:00
parent 1a2862798a
commit 135111a05b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/linux/ramips/files/drivers/net/ramips.c
View File

@ -147,6 +147,8 @@ ramips_eth_hard_start_xmit(struct sk_buff* skb, struct net_device *dev)
unsigned long tx; unsigned long tx;
unsigned int tx_next; unsigned int tx_next;
unsigned int mapped_addr; unsigned int mapped_addr;
if(priv->plat->min_pkt_len) if(priv->plat->min_pkt_len)
{ {
if(skb->len < priv->plat->min_pkt_len) if(skb->len < priv->plat->min_pkt_len)
@ -169,9 +171,9 @@ ramips_eth_hard_start_xmit(struct sk_buff* skb, struct net_device *dev)
tx_next = 0; tx_next = 0;
else else
tx_next = tx + 1; tx_next = tx + 1;
if((priv->tx_skb[tx]== 0) && (priv->tx_skb[tx_next] == 0)) if((priv->tx_skb[tx] == 0) && (priv->tx_skb[tx_next] == 0))
{ {
if(!(priv->tx[tx].txd2 & TX_DMA_DONE)) if(!(priv->tx[tx].txd2 & TX_DMA_DONE) || !(priv->tx[tx_next].txd2 & TX_DMA_DONE))
{ {
kfree_skb(skb); kfree_skb(skb);
dev->stats.tx_dropped++; dev->stats.tx_dropped++;
@ -181,10 +183,12 @@ ramips_eth_hard_start_xmit(struct sk_buff* skb, struct net_device *dev)
priv->tx[tx].txd1 = virt_to_phys(skb->data); priv->tx[tx].txd1 = virt_to_phys(skb->data);
priv->tx[tx].txd2 &= ~(TX_DMA_PLEN0_MASK | TX_DMA_DONE); priv->tx[tx].txd2 &= ~(TX_DMA_PLEN0_MASK | TX_DMA_DONE);
priv->tx[tx].txd2 |= TX_DMA_PLEN0(skb->len); priv->tx[tx].txd2 |= TX_DMA_PLEN0(skb->len);
wmb();
ramips_fe_wr((tx + 1) % NUM_TX_DESC, RAMIPS_TX_CTX_IDX0); ramips_fe_wr((tx + 1) % NUM_TX_DESC, RAMIPS_TX_CTX_IDX0);
dev->stats.tx_packets++; dev->stats.tx_packets++;
dev->stats.tx_bytes += skb->len; dev->stats.tx_bytes += skb->len;
priv->tx_skb[tx] = skb; priv->tx_skb[tx] = skb;
wmb();
ramips_fe_wr((tx + 1) % NUM_TX_DESC, RAMIPS_TX_CTX_IDX0); ramips_fe_wr((tx + 1) % NUM_TX_DESC, RAMIPS_TX_CTX_IDX0);
} else { } else {
dev->stats.tx_dropped++; dev->stats.tx_dropped++;
@ -228,6 +232,7 @@ ramips_eth_rx_hw(unsigned long ptr)
dma_map_single(NULL, new_skb->data, MAX_RX_LENGTH + 2, dma_map_single(NULL, new_skb->data, MAX_RX_LENGTH + 2,
DMA_FROM_DEVICE); DMA_FROM_DEVICE);
priv->rx[rx].rxd2 &= ~RX_DMA_DONE; priv->rx[rx].rxd2 &= ~RX_DMA_DONE;
wmb();
ramips_fe_wr(rx, RAMIPS_RX_CALC_IDX0); ramips_fe_wr(rx, RAMIPS_RX_CALC_IDX0);
} }
if(max_rx == 0) if(max_rx == 0)