ramips: raeth: use dma_addr_t for the descriptors

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30444 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ramips/files/drivers/net/ramips.c b/target/linux/ramips/files/drivers/net/ramips.c
index 17ef00b..6066852 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ramips.c
+++ b/target/linux/ramips/files/drivers/net/ramips.c
@@ -134,12 +134,12 @@ ramips_cleanup_dma(struct raeth_priv *re)
        if (re->rx)
                dma_free_coherent(NULL,
                                  NUM_RX_DESC * sizeof(struct ramips_rx_dma),
        if (re->rx)
                dma_free_coherent(NULL,
                                  NUM_RX_DESC * sizeof(struct ramips_rx_dma),

-                                 re->rx, re->phy_rx);
+                                 re->rx, re->rx_desc_dma);

 
        if (re->tx)
                dma_free_coherent(NULL,
                                  NUM_TX_DESC * sizeof(struct ramips_tx_dma),
 
        if (re->tx)
                dma_free_coherent(NULL,
                                  NUM_TX_DESC * sizeof(struct ramips_tx_dma),

-                                 re->tx, re->phy_tx);
+                                 re->tx, re->tx_desc_dma);

 }
 
 static int
 }
 
 static int


@@ -153,7 +153,7 @@ ramips_alloc_dma(struct raeth_priv *re)
        /* setup tx ring */
        re->tx = dma_alloc_coherent(NULL,
                                    NUM_TX_DESC * sizeof(struct ramips_tx_dma),
        /* setup tx ring */
        re->tx = dma_alloc_coherent(NULL,
                                    NUM_TX_DESC * sizeof(struct ramips_tx_dma),

-                                   &re->phy_tx, GFP_ATOMIC);
+                                   &re->tx_desc_dma, GFP_ATOMIC);

        if (!re->tx)
                goto err_cleanup;
 
        if (!re->tx)
                goto err_cleanup;
 


@@ -166,7 +166,7 @@ ramips_alloc_dma(struct raeth_priv *re)
        /* setup rx ring */
        re->rx = dma_alloc_coherent(NULL,
                                    NUM_RX_DESC * sizeof(struct ramips_rx_dma),
        /* setup rx ring */
        re->rx = dma_alloc_coherent(NULL,
                                    NUM_RX_DESC * sizeof(struct ramips_rx_dma),

-                                   &re->phy_rx, GFP_ATOMIC);
+                                   &re->rx_desc_dma, GFP_ATOMIC);

        if (!re->rx)
                goto err_cleanup;
 
        if (!re->rx)
                goto err_cleanup;
 


@@ -197,12 +197,12 @@ ramips_alloc_dma(struct raeth_priv *re)
 static void
 ramips_setup_dma(struct raeth_priv *re)
 {
 static void
 ramips_setup_dma(struct raeth_priv *re)
 {

-       ramips_fe_wr(phys_to_bus(re->phy_tx), RAMIPS_TX_BASE_PTR0);
+       ramips_fe_wr(re->tx_desc_dma, RAMIPS_TX_BASE_PTR0);

        ramips_fe_wr(NUM_TX_DESC, RAMIPS_TX_MAX_CNT0);
        ramips_fe_wr(0, RAMIPS_TX_CTX_IDX0);
        ramips_fe_wr(RAMIPS_PST_DTX_IDX0, RAMIPS_PDMA_RST_CFG);
 
        ramips_fe_wr(NUM_TX_DESC, RAMIPS_TX_MAX_CNT0);
        ramips_fe_wr(0, RAMIPS_TX_CTX_IDX0);
        ramips_fe_wr(RAMIPS_PST_DTX_IDX0, RAMIPS_PDMA_RST_CFG);
 

-       ramips_fe_wr(phys_to_bus(re->phy_rx), RAMIPS_RX_BASE_PTR0);
+       ramips_fe_wr(re->rx_desc_dma, RAMIPS_RX_BASE_PTR0);

        ramips_fe_wr(NUM_RX_DESC, RAMIPS_RX_MAX_CNT0);
        ramips_fe_wr((NUM_RX_DESC - 1), RAMIPS_RX_CALC_IDX0);
        ramips_fe_wr(RAMIPS_PST_DRX_IDX0, RAMIPS_PDMA_RST_CFG);
        ramips_fe_wr(NUM_RX_DESC, RAMIPS_RX_MAX_CNT0);
        ramips_fe_wr((NUM_RX_DESC - 1), RAMIPS_RX_CALC_IDX0);
        ramips_fe_wr(RAMIPS_PST_DRX_IDX0, RAMIPS_PDMA_RST_CFG);


@@ -282,7 +282,7 @@ 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) {
                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_address_t */
+                       /* TODO: convert to use dma_addr_t */

                        dma_unmap_single(NULL, priv->rx[rx].rxd1, MAX_RX_LENGTH,
                                         DMA_FROM_DEVICE);
 
                        dma_unmap_single(NULL, priv->rx[rx].rxd1, MAX_RX_LENGTH,
                                         DMA_FROM_DEVICE);
 

diff --git a/target/linux/ramips/files/drivers/net/ramips_eth.h b/target/linux/ramips/files/drivers/net/ramips_eth.h
index 9ad6046..a69754b 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ramips_eth.h
+++ b/target/linux/ramips/files/drivers/net/ramips_eth.h
@@ -22,6 +22,7 @@
 #include <linux/mii.h>
 #include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/mii.h>
 #include <linux/interrupt.h>
 #include <linux/netdevice.h>

+#include <linux/dma-mapping.h>

 
 #define NUM_RX_DESC     256
 #define NUM_TX_DESC     256
 
 #define NUM_RX_DESC     256
 #define NUM_TX_DESC     256


@@ -214,12 +215,12 @@ struct ramips_tx_dma {
 
 struct raeth_priv
 {
 
 struct raeth_priv
 {

-       unsigned int            phy_rx;
+       dma_addr_t              rx_desc_dma;

        struct tasklet_struct   rx_tasklet;
        struct ramips_rx_dma    *rx;
        struct sk_buff          *rx_skb[NUM_RX_DESC];
 
        struct tasklet_struct   rx_tasklet;
        struct ramips_rx_dma    *rx;
        struct sk_buff          *rx_skb[NUM_RX_DESC];
 

-       unsigned int            phy_tx;
+       dma_addr_t              tx_desc_dma;

        struct tasklet_struct   tx_housekeeping_tasklet;
        struct ramips_tx_dma    *tx;
        struct sk_buff          *tx_skb[NUM_TX_DESC];
        struct tasklet_struct   tx_housekeeping_tasklet;
        struct ramips_tx_dma    *tx;
        struct sk_buff          *tx_skb[NUM_TX_DESC];