ramips: raeth: cleanup DMA API usage in ramips_eth_hard_start_xmit

[openwrt/staging/lynxis/omap.git] / target / linux / ramips / files / drivers / net / ramips.c

diff --git a/target/linux/ramips/files/drivers/net/ramips.c b/target/linux/ramips/files/drivers/net/ramips.c
index 60668521523d771aa17e693af7962b0a94351964..273c00dc2a1c7ef1284aa85e27f2790236827715 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ramips.c
+++ b/target/linux/ramips/files/drivers/net/ramips.c
@@ -128,8 +128,11 @@ ramips_cleanup_dma(struct raeth_priv *re)
        int i;
 
        for (i = 0; i < NUM_RX_DESC; i++)
-               if (re->rx_skb[i])
+               if (re->rx_skb[i]) {
+                       dma_unmap_single(NULL, re->rx_dma[i], MAX_RX_LENGTH,
+                                        DMA_FROM_DEVICE);
                        dev_kfree_skb_any(re->rx_skb[i]);
+               }
 
        if (re->rx)
                dma_free_coherent(NULL,
@@ -172,6 +175,7 @@ ramips_alloc_dma(struct raeth_priv *re)
 
        memset(re->rx, 0, sizeof(struct ramips_rx_dma) * NUM_RX_DESC);
        for (i = 0; i < NUM_RX_DESC; i++) {
+               dma_addr_t dma_addr;
                struct sk_buff *new_skb = dev_alloc_skb(MAX_RX_LENGTH +
                                                        NET_IP_ALIGN);
 
@@ -179,10 +183,11 @@ ramips_alloc_dma(struct raeth_priv *re)
                        goto err_cleanup;
 
                skb_reserve(new_skb, NET_IP_ALIGN);
-               re->rx[i].rxd1 = dma_map_single(NULL,
-                                               new_skb->data,
-                                               MAX_RX_LENGTH,
-                                               DMA_FROM_DEVICE);
+
+               dma_addr = dma_map_single(NULL, new_skb->data,
+                                         MAX_RX_LENGTH, DMA_FROM_DEVICE);
+               re->rx_dma[i] = dma_addr;
+               re->rx[i].rxd1 = (unsigned int) re->rx_dma[i];
                re->rx[i].rxd2 |= RX_DMA_LSO;
                re->rx_skb[i] = new_skb;
        }
@@ -214,7 +219,7 @@ ramips_eth_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
        struct raeth_priv *priv = netdev_priv(dev);
        unsigned long tx;
        unsigned int tx_next;
-       unsigned int mapped_addr;
+       dma_addr_t mapped_addr;
 
        if (priv->plat->min_pkt_len) {
                if (skb->len < priv->plat->min_pkt_len) {
@@ -229,9 +234,8 @@ ramips_eth_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
        }
 
        dev->trans_start = jiffies;
-       mapped_addr = (unsigned int) dma_map_single(NULL, skb->data, skb->len,
-                                                   DMA_TO_DEVICE);
-       dma_sync_single_for_device(NULL, mapped_addr, skb->len, DMA_TO_DEVICE);
+       mapped_addr = dma_map_single(NULL, skb->data, skb->len, DMA_TO_DEVICE);
+
        spin_lock(&priv->page_lock);
        tx = ramips_fe_rr(RAMIPS_TX_CTX_IDX0);
        tx_next = (tx + 1) % NUM_TX_DESC;
@@ -241,7 +245,7 @@ ramips_eth_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
            !(priv->tx[tx_next].txd2 & TX_DMA_DONE))
                goto out;
 
-       priv->tx[tx].txd1 = mapped_addr;
+       priv->tx[tx].txd1 = (unsigned int) mapped_addr;
        priv->tx[tx].txd2 &= ~(TX_DMA_PLEN0_MASK | TX_DMA_DONE);
        priv->tx[tx].txd2 |= TX_DMA_PLEN0(skb->len);
        dev->stats.tx_packets++;
@@ -282,8 +286,9 @@ ramips_eth_rx_hw(unsigned long ptr)
                new_skb = netdev_alloc_skb(dev, MAX_RX_LENGTH + NET_IP_ALIGN);
                /* Reuse the buffer on allocation failures */
                if (new_skb) {
-                       /* TODO: convert to use dma_addr_t */
-                       dma_unmap_single(NULL, priv->rx[rx].rxd1, MAX_RX_LENGTH,
+                       dma_addr_t dma_addr;
+
+                       dma_unmap_single(NULL, priv->rx_dma[rx], MAX_RX_LENGTH,
                                         DMA_FROM_DEVICE);
 
                        skb_put(rx_skb, pktlen);
@@ -296,10 +301,13 @@ ramips_eth_rx_hw(unsigned long ptr)
 
                        priv->rx_skb[rx] = new_skb;
                        skb_reserve(new_skb, NET_IP_ALIGN);
-                       priv->rx[rx].rxd1 = dma_map_single(NULL,
-                                                          new_skb->data,
-                                                          MAX_RX_LENGTH,
-                                                          DMA_FROM_DEVICE);
+
+                       dma_addr = dma_map_single(NULL,
+                                                 new_skb->data,
+                                                 MAX_RX_LENGTH,
+                                                 DMA_FROM_DEVICE);
+                       priv->rx_dma[rx] = dma_addr;
+                       priv->rx[rx].rxd1 = (unsigned int) dma_addr;
                } else {
                        dev->stats.rx_dropped++;
                }