ar71xx: ag71xx: use correct device pointer for dma_map_single

[openwrt.git] / target / linux / ar71xx / files / drivers / net / ag71xx / ag71xx_main.c

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
index c8c61de..a3edd43 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -1,7 +1,7 @@
 /*
  *  Atheros AR71xx built-in ethernet mac driver
  *
- *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *
  *  Based on Atheros' AG7100 driver
@@ -11,7 +11,6 @@
  *  by the Free Software Foundation.
  */
 
-#include <linux/cache.h>
 #include "ag71xx.h"
 
 #define AG71XX_DEFAULT_MSG_ENABLE      \
@@ -209,21 +208,22 @@ static int ag71xx_ring_rx_init(struct ag71xx *ag)
 
        for (i = 0; i < AG71XX_RX_RING_SIZE; i++) {
                struct sk_buff *skb;
+               dma_addr_t dma_addr;
 
-               skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE);
+               skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE + AG71XX_RX_PKT_RESERVE);
                if (!skb) {
                        ret = -ENOMEM;
                        break;
                }
 
-               dma_map_single(NULL, skb->data, AG71XX_RX_PKT_SIZE,
-                               DMA_FROM_DEVICE);
-
                skb->dev = ag->dev;
                skb_reserve(skb, AG71XX_RX_PKT_RESERVE);
 
+               dma_addr = dma_map_single(&ag->dev->dev, skb->data,
+                                         AG71XX_RX_PKT_SIZE,
+                                         DMA_FROM_DEVICE);
                ring->buf[i].skb = skb;
-               ring->buf[i].desc->data = virt_to_phys(skb->data);
+               ring->buf[i].desc->data = (u32) dma_addr;
                ring->buf[i].desc->ctrl = DESC_EMPTY;
        }
 
@@ -248,20 +248,23 @@ static int ag71xx_ring_rx_refill(struct ag71xx *ag)
                i = ring->dirty % AG71XX_RX_RING_SIZE;
 
                if (ring->buf[i].skb == NULL) {
+                       dma_addr_t dma_addr;
                        struct sk_buff *skb;
 
-                       skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE);
+                       skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE +
+                                           AG71XX_RX_PKT_RESERVE);
                        if (skb == NULL)
                                break;
 
-                       dma_map_single(NULL, skb->data, AG71XX_RX_PKT_SIZE,
-                                       DMA_FROM_DEVICE);
-
                        skb_reserve(skb, AG71XX_RX_PKT_RESERVE);
                        skb->dev = ag->dev;
 
+                       dma_addr = dma_map_single(&ag->dev->dev, skb->data,
+                                                 AG71XX_RX_PKT_SIZE,
+                                                 DMA_FROM_DEVICE);
+
                        ring->buf[i].skb = skb;
-                       ring->buf[i].desc->data = virt_to_phys(skb->data);
+                       ring->buf[i].desc->data = (u32) dma_addr;
                }
 
                ring->buf[i].desc->ctrl = DESC_EMPTY;
@@ -390,7 +393,12 @@ static void ag71xx_hw_init(struct ag71xx *ag)
        mdelay(100);
 
        /* setup MAC configuration registers */
-       ag71xx_wr(ag, AG71XX_REG_MAC_CFG1, MAC_CFG1_INIT);
+       if (pdata->is_ar724x)
+               ag71xx_wr(ag, AG71XX_REG_MAC_CFG1,
+                         MAC_CFG1_INIT | MAC_CFG1_TFC | MAC_CFG1_RFC);
+       else
+               ag71xx_wr(ag, AG71XX_REG_MAC_CFG1, MAC_CFG1_INIT);
+
        ag71xx_sb(ag, AG71XX_REG_MAC_CFG2,
                  MAC_CFG2_PAD_CRC_EN | MAC_CFG2_LEN_CHECK);
 
@@ -486,11 +494,13 @@ static int ag71xx_stop(struct net_device *dev)
        return 0;
 }
 
-static int ag71xx_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
+                                         struct net_device *dev)
 {
        struct ag71xx *ag = netdev_priv(dev);
        struct ag71xx_ring *ring = &ag->tx_ring;
        struct ag71xx_desc *desc;
+       dma_addr_t dma_addr;
        int i;
 
        i = ring->curr % AG71XX_TX_RING_SIZE;
@@ -506,12 +516,13 @@ static int ag71xx_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                goto err_drop;
        }
 
-       dma_map_single(NULL, skb->data, skb->len, DMA_TO_DEVICE);
+       dma_addr = dma_map_single(&dev->dev, skb->data, skb->len,
+                                 DMA_TO_DEVICE);
 
        ring->buf[i].skb = skb;
 
        /* setup descriptor fields */
-       desc->data = virt_to_phys(skb->data);
+       desc->data = (u32) dma_addr;
        desc->ctrl = (skb->len & DESC_PKTLEN_M);
 
        /* flush descriptor */
@@ -530,13 +541,13 @@ static int ag71xx_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
        dev->trans_start = jiffies;
 
-       return 0;
+       return NETDEV_TX_OK;
 
  err_drop:
        dev->stats.tx_dropped++;
 
        dev_kfree_skb(skb);
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
@@ -608,10 +619,10 @@ static void ag71xx_restart_work_func(struct work_struct *work)
        ag71xx_open(ag->dev);
 }
 
-static void ag71xx_tx_packets(struct ag71xx *ag)
+static int ag71xx_tx_packets(struct ag71xx *ag)
 {
        struct ag71xx_ring *ring = &ag->tx_ring;
-       unsigned int sent;
+       int sent;
 
        DBG("%s: processing TX ring\n", ag->dev->name);
 
@@ -641,6 +652,7 @@ static void ag71xx_tx_packets(struct ag71xx *ag)
        if ((ring->curr - ring->dirty) < AG71XX_TX_THRES_WAKEUP)
                netif_wake_queue(ag->dev);
 
+       return sent;
 }
 
 static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
@@ -711,13 +723,16 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
        struct ag71xx_ring *rx_ring;
        unsigned long flags;
        u32 status;
-       int done;
+       int tx_done;
+       int rx_done;
 
        pdata->ddr_flush();
-       ag71xx_tx_packets(ag);
+       tx_done = ag71xx_tx_packets(ag);
 
        DBG("%s: processing RX ring\n", dev->name);
-       done = ag71xx_rx_packets(ag, limit);
+       rx_done = ag71xx_rx_packets(ag, limit);
+
+       ag71xx_debugfs_update_napi_stats(ag, rx_done, tx_done);
 
        rx_ring = &ag->rx_ring;
        if (rx_ring->buf[rx_ring->dirty % AG71XX_RX_RING_SIZE].skb == NULL)
@@ -732,7 +747,7 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
                ag71xx_wr(ag, AG71XX_REG_RX_CTRL, RX_CTRL_RXE);
        }
 
-       if (done < limit) {
+       if (rx_done < limit) {
                if (status & RX_STATUS_PR)
                        goto more;
 
@@ -740,8 +755,8 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
                if (status & TX_STATUS_PS)
                        goto more;
 
-               DBG("%s: disable polling mode, done=%d, limit=%d\n",
-                       dev->name, done, limit);
+               DBG("%s: disable polling mode, rx=%d, tx=%d,limit=%d\n",
+                       dev->name, rx_done, tx_done, limit);
 
                napi_complete(napi);
 
@@ -749,13 +764,13 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
                spin_lock_irqsave(&ag->lock, flags);
                ag71xx_int_enable(ag, AG71XX_INT_POLL);
                spin_unlock_irqrestore(&ag->lock, flags);
-               return done;
+               return rx_done;
        }
 
  more:
-       DBG("%s: stay in polling mode, done=%d, limit=%d\n",
-                       dev->name, done, limit);
-       return done;
+       DBG("%s: stay in polling mode, rx=%d, tx=%d, limit=%d\n",
+                       dev->name, rx_done, tx_done, limit);
+       return rx_done;
 
  oom:
        if (netif_msg_rx_err(ag))
@@ -795,6 +810,8 @@ static irqreturn_t ag71xx_interrupt(int irq, void *dev_id)
                napi_schedule(&ag->napi);
        }
 
+       ag71xx_debugfs_update_int_stats(ag, status);
+
        return IRQ_HANDLED;
 }
 
@@ -922,10 +939,16 @@ static int __init ag71xx_probe(struct platform_device *pdev)
        if (err)
                goto err_unregister_netdev;
 
+       err = ag71xx_debugfs_init(ag);
+       if (err)
+               goto err_phy_disconnect;
+
        platform_set_drvdata(pdev, dev);
 
        return 0;
 
+ err_phy_disconnect:
+       ag71xx_phy_disconnect(ag);
  err_unregister_netdev:
        unregister_netdev(dev);
  err_free_irq:
@@ -948,6 +971,7 @@ static int __exit ag71xx_remove(struct platform_device *pdev)
        if (dev) {
                struct ag71xx *ag = netdev_priv(dev);
 
+               ag71xx_debugfs_exit(ag);
                ag71xx_phy_disconnect(ag);
                unregister_netdev(dev);
                free_irq(dev->irq, dev);
@@ -972,10 +996,14 @@ static int __init ag71xx_module_init(void)
 {
        int ret;
 
-       ret = ag71xx_mdio_driver_init();
+       ret = ag71xx_debugfs_root_init();
        if (ret)
                goto err_out;
 
+       ret = ag71xx_mdio_driver_init();
+       if (ret)
+               goto err_debugfs_exit;
+
        ret = platform_driver_register(&ag71xx_driver);
        if (ret)
                goto err_mdio_exit;
@@ -984,6 +1012,8 @@ static int __init ag71xx_module_init(void)
 
  err_mdio_exit:
        ag71xx_mdio_driver_exit();
+ err_debugfs_exit:
+       ag71xx_debugfs_root_exit();
  err_out:
        return ret;
 }
@@ -992,6 +1022,7 @@ static void __exit ag71xx_module_exit(void)
 {
        platform_driver_unregister(&ag71xx_driver);
        ag71xx_mdio_driver_exit();
+       ag71xx_debugfs_root_exit();
 }
 
 module_init(ag71xx_module_init);