qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-04 19:03:09 +02:00
Code

[ramips] clean up dma api of ethernet driver

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18150 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
blogic 2009-10-25 16:58:00 +00:00
parent 6c7f40ae71
commit 4c7c2a504c
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,8 @@
#include "ramips_esw.c" #include "ramips_esw.c"
#endif #endif
#define phys_to_bus(a) (a & 0x1FFFFFFF)
static struct net_device * ramips_dev; static struct net_device * ramips_dev;
static void __iomem *ramips_fe_base = 0; static void __iomem *ramips_fe_base = 0;
@ -57,15 +59,14 @@ ramips_fe_rr(unsigned reg)
static int static int
ramips_alloc_dma(struct net_device *dev) ramips_alloc_dma(struct net_device *dev)
{ {
#define phys_to_bus(a) (a & 0x1FFFFFFF)
struct raeth_priv *priv = netdev_priv(dev); struct raeth_priv *priv = netdev_priv(dev);
int i; int i;
priv->skb_free_idx = 0; priv->skb_free_idx = 0;
/* setup tx ring */ /* setup tx ring */
priv->tx = pci_alloc_consistent(NULL, priv->tx = dma_alloc_coherent(NULL,
NUM_TX_DESC * sizeof(struct ramips_tx_dma), &priv->phy_tx); NUM_TX_DESC * sizeof(struct ramips_tx_dma), &priv->phy_tx, GFP_ATOMIC);
for(i = 0; i < NUM_TX_DESC; i++) for(i = 0; i < NUM_TX_DESC; i++)
{ {
memset(&priv->tx[i], 0, sizeof(struct ramips_tx_dma)); memset(&priv->tx[i], 0, sizeof(struct ramips_tx_dma));
@ -79,8 +80,8 @@ ramips_alloc_dma(struct net_device *dev)
ramips_fe_wr(RAMIPS_PST_DTX_IDX0, RAMIPS_PDMA_RST_CFG); ramips_fe_wr(RAMIPS_PST_DTX_IDX0, RAMIPS_PDMA_RST_CFG);
/* setup rx ring */ /* setup rx ring */
priv->rx = pci_alloc_consistent(NULL, priv->rx = dma_alloc_coherent(NULL,
NUM_RX_DESC * sizeof(struct ramips_rx_dma), &priv->phy_rx); NUM_RX_DESC * sizeof(struct ramips_rx_dma), &priv->phy_rx, GFP_ATOMIC);
memset(priv->rx, 0, sizeof(struct ramips_rx_dma) * NUM_RX_DESC); memset(priv->rx, 0, sizeof(struct ramips_rx_dma) * NUM_RX_DESC);
for(i = 0; i < NUM_RX_DESC; i++) for(i = 0; i < NUM_RX_DESC; i++)
{ {
@ -93,9 +94,6 @@ ramips_alloc_dma(struct net_device *dev)
priv->rx[i].rxd2 |= RX_DMA_LSO; priv->rx[i].rxd2 |= RX_DMA_LSO;
priv->rx_skb[i] = new_skb; priv->rx_skb[i] = new_skb;
} }
dma_cache_wback_inv((unsigned long)priv->rx,
NUM_RX_DESC * (sizeof(struct ramips_rx_dma)));
ramips_fe_wr(phys_to_bus(priv->phy_rx), RAMIPS_RX_BASE_PTR0); ramips_fe_wr(phys_to_bus(priv->phy_rx), RAMIPS_RX_BASE_PTR0);
ramips_fe_wr(NUM_RX_DESC, RAMIPS_RX_MAX_CNT0); ramips_fe_wr(NUM_RX_DESC, RAMIPS_RX_MAX_CNT0);
ramips_fe_wr((NUM_RX_DESC - 1), RAMIPS_RX_CALC_IDX0); ramips_fe_wr((NUM_RX_DESC - 1), RAMIPS_RX_CALC_IDX0);
@ -110,7 +108,7 @@ ramips_eth_hard_start_xmit(struct sk_buff* skb, struct net_device *dev)
struct raeth_priv *priv = netdev_priv(dev); struct raeth_priv *priv = netdev_priv(dev);
unsigned long tx; unsigned long tx;
unsigned int tx_next; unsigned int tx_next;
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)
@ -125,7 +123,9 @@ ramips_eth_hard_start_xmit(struct sk_buff* skb, struct net_device *dev)
} }
} }
dev->trans_start = jiffies; dev->trans_start = jiffies;
dma_cache_wback_inv((unsigned long)skb->data, skb->len); mapped_addr = (unsigned int)dma_map_single(NULL, skb->data, skb->len,
PCI_DMA_TODEVICE);
dma_sync_single_for_device(NULL, mapped_addr, skb->len, PCI_DMA_TODEVICE);
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;
@ -190,8 +190,6 @@ 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,
PCI_DMA_FROMDEVICE); PCI_DMA_FROMDEVICE);
priv->rx[rx].rxd2 &= ~RX_DMA_DONE; priv->rx[rx].rxd2 &= ~RX_DMA_DONE;
dma_cache_wback_inv((unsigned long)&priv->rx[rx],
sizeof(struct ramips_rx_dma));
ramips_fe_wr(rx, RAMIPS_RX_CALC_IDX0); ramips_fe_wr(rx, RAMIPS_RX_CALC_IDX0);
} }
if(max_rx == 0) if(max_rx == 0)