qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-25 12:24:35 +02:00
Code

[ramips] fixes rx path for eth, spinlock it, increases buffer size, board now survives ping -f

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18212 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
blogic 2009-10-29 21:08:11 +00:00
parent b08f29cbc9
commit f46dbe37e1
1 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@
#include "ramips_eth.h" #include "ramips_eth.h"
#define TX_TIMEOUT (20 * HZ / 100) #define TX_TIMEOUT (20 * HZ / 100)
#define MAX_RX_LENGTH 1500 #define MAX_RX_LENGTH 1600
#ifdef CONFIG_RALINK_RT305X #ifdef CONFIG_RALINK_RT305X
#include "ramips_esw.c" #include "ramips_esw.c"
@ -147,7 +147,7 @@ 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;
unsigned long flags;
if(priv->plat->min_pkt_len) if(priv->plat->min_pkt_len)
{ {
@ -166,35 +166,30 @@ ramips_eth_hard_start_xmit(struct sk_buff* skb, struct net_device *dev)
mapped_addr = (unsigned int)dma_map_single(NULL, skb->data, skb->len, mapped_addr = (unsigned int)dma_map_single(NULL, skb->data, skb->len,
DMA_TO_DEVICE); DMA_TO_DEVICE);
dma_sync_single_for_device(NULL, mapped_addr, skb->len, DMA_TO_DEVICE); dma_sync_single_for_device(NULL, mapped_addr, skb->len, DMA_TO_DEVICE);
spin_lock_irqsave(&priv->page_lock, flags);
tx = ramips_fe_rr(RAMIPS_TX_CTX_IDX0); tx = ramips_fe_rr(RAMIPS_TX_CTX_IDX0);
if(tx == NUM_TX_DESC - 1) if(tx == NUM_TX_DESC - 1)
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]) || (priv->tx_skb[tx_next]) ||
{ !(priv->tx[tx].txd2 & TX_DMA_DONE) || !(priv->tx[tx_next].txd2 & TX_DMA_DONE))
if(!(priv->tx[tx].txd2 & TX_DMA_DONE) || !(priv->tx[tx_next].txd2 & TX_DMA_DONE)) goto out;
{ priv->tx[tx].txd1 = mapped_addr;
kfree_skb(skb); priv->tx[tx].txd2 &= ~(TX_DMA_PLEN0_MASK | TX_DMA_DONE);
dev->stats.tx_dropped++; priv->tx[tx].txd2 |= TX_DMA_PLEN0(skb->len);
printk(KERN_ERR "%s: dropping\n", dev->name); dev->stats.tx_packets++;
return 0; dev->stats.tx_bytes += skb->len;
} priv->tx_skb[tx] = skb;
priv->tx[tx].txd1 = virt_to_phys(skb->data); wmb();
priv->tx[tx].txd2 &= ~(TX_DMA_PLEN0_MASK | TX_DMA_DONE); ramips_fe_wr((tx + 1) % NUM_TX_DESC, RAMIPS_TX_CTX_IDX0);
priv->tx[tx].txd2 |= TX_DMA_PLEN0(skb->len); spin_unlock_irqrestore(&priv->page_lock, flags);
wmb(); return NETDEV_TX_OK;
ramips_fe_wr((tx + 1) % NUM_TX_DESC, RAMIPS_TX_CTX_IDX0); out:
dev->stats.tx_packets++; spin_unlock_irqrestore(&priv->page_lock, flags);
dev->stats.tx_bytes += skb->len; dev->stats.tx_dropped++;
priv->tx_skb[tx] = skb; kfree_skb(skb);
wmb(); return NETDEV_TX_OK;
ramips_fe_wr((tx + 1) % NUM_TX_DESC, RAMIPS_TX_CTX_IDX0);
} else {
dev->stats.tx_dropped++;
kfree_skb(skb);
}
return 0;
} }
static void static void
@ -216,7 +211,6 @@ ramips_eth_rx_hw(unsigned long ptr)
rx_skb = priv->rx_skb[rx]; rx_skb = priv->rx_skb[rx];
rx_skb->len = RX_DMA_PLEN0(priv->rx[rx].rxd2); rx_skb->len = RX_DMA_PLEN0(priv->rx[rx].rxd2);
rx_skb->tail = rx_skb->data + rx_skb->len;
rx_skb->dev = dev; rx_skb->dev = dev;
rx_skb->protocol = eth_type_trans(rx_skb, dev); rx_skb->protocol = eth_type_trans(rx_skb, dev);
rx_skb->ip_summed = CHECKSUM_NONE; rx_skb->ip_summed = CHECKSUM_NONE;
@ -224,7 +218,7 @@ ramips_eth_rx_hw(unsigned long ptr)
dev->stats.rx_bytes += rx_skb->len; dev->stats.rx_bytes += rx_skb->len;
netif_rx(rx_skb); netif_rx(rx_skb);
new_skb = __dev_alloc_skb(MAX_RX_LENGTH + 2, GFP_DMA | GFP_ATOMIC); new_skb = netdev_alloc_skb(dev, MAX_RX_LENGTH + 2);
priv->rx_skb[rx] = new_skb; priv->rx_skb[rx] = new_skb;
BUG_ON(!new_skb); BUG_ON(!new_skb);
skb_reserve(new_skb, 2); skb_reserve(new_skb, 2);
@ -384,6 +378,7 @@ ramips_eth_probe(struct net_device *dev)
dev->mtu = MAX_RX_LENGTH; dev->mtu = MAX_RX_LENGTH;
dev->tx_timeout = ramips_eth_timeout; dev->tx_timeout = ramips_eth_timeout;
dev->watchdog_timeo = TX_TIMEOUT; dev->watchdog_timeo = TX_TIMEOUT;
spin_lock_init(&priv->page_lock);
return 0; return 0;
} }