ramips: free allocated skbs in ramips_cleanup_dma
[openwrt/svn-archive/archive.git] / target / linux / ramips / files / drivers / net / ramips.c
index f3e056650be71e7e7507650b084984994ce3a0b1..43ccdfc1f70101cad2a88392801b2f51d3a3b7ec 100644 (file)
@@ -1,8 +1,7 @@
 /*
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
+ *   the Free Software Foundation; version 2 of the License
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  */
 
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
-#include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/init.h>
 #include <linux/skbuff.h>
-#include <linux/if_vlan.h>
-#include <linux/if_ether.h>
+#include <linux/etherdevice.h>
 #include <linux/platform_device.h>
-#include <asm/uaccess.h>
-#include <net/sock.h>
-#include <asm/uaccess.h>
 
 #include <eth.h>
 
@@ -39,6 +33,8 @@
 #include "ramips_esw.c"
 #endif
 
+#define phys_to_bus(a)  (a & 0x1FFFFFFF)
+
 static struct net_device * ramips_dev;
 static void __iomem *ramips_fe_base = 0;
 
@@ -54,18 +50,34 @@ ramips_fe_rr(unsigned reg)
        return __raw_readl(ramips_fe_base + reg);
 }
 
+static void
+ramips_cleanup_dma(struct net_device *dev)
+{
+       struct raeth_priv *priv = netdev_priv(dev);
+       int i;
+
+       for (i = 0; i < NUM_RX_DESC; i++)
+               if (priv->rx_skb[i])
+                       dev_kfree_skb_any(priv->rx_skb[i]);
+
+       dma_free_coherent(NULL, NUM_RX_DESC * sizeof(struct ramips_rx_dma),
+               priv->rx, priv->phy_rx);
+
+       dma_free_coherent(NULL, NUM_TX_DESC * sizeof(struct ramips_tx_dma),
+               priv->tx, priv->phy_tx);
+}
+
 static int
 ramips_alloc_dma(struct net_device *dev)
 {
-#define phys_to_bus(a)  (a & 0x1FFFFFFF)
-       struct raeth_priv *priv = (struct raeth_priv*)netdev_priv(dev);
+       struct raeth_priv *priv = netdev_priv(dev);
        int i;
 
        priv->skb_free_idx = 0;
 
        /* setup tx ring */
-       priv->tx = pci_alloc_consistent(NULL,
-               NUM_TX_DESC * sizeof(struct ramips_tx_dma), &priv->phy_tx);
+       priv->tx = dma_alloc_coherent(NULL,
+               NUM_TX_DESC * sizeof(struct ramips_tx_dma), &priv->phy_tx, GFP_ATOMIC);
        for(i = 0; i < NUM_TX_DESC; i++)
        {
                memset(&priv->tx[i], 0, sizeof(struct ramips_tx_dma));
@@ -73,14 +85,10 @@ ramips_alloc_dma(struct net_device *dev)
                priv->tx[i].txd4 &= (TX_DMA_QN_MASK | TX_DMA_PN_MASK);
                priv->tx[i].txd4 |= TX_DMA_QN(3) | TX_DMA_PN(1);
        }
-       ramips_fe_wr(phys_to_bus(priv->phy_tx), 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);
 
        /* setup rx ring */
-       priv->rx = pci_alloc_consistent(NULL,
-               NUM_RX_DESC * sizeof(struct ramips_rx_dma), &priv->phy_rx);
+       priv->rx = dma_alloc_coherent(NULL,
+               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);
        for(i = 0; i < NUM_RX_DESC; i++)
        {
@@ -89,28 +97,37 @@ ramips_alloc_dma(struct net_device *dev)
                skb_reserve(new_skb, 2);
                priv->rx[i].rxd1 =
                        dma_map_single(NULL, skb_put(new_skb, 2), MAX_RX_LENGTH + 2,
-                               PCI_DMA_FROMDEVICE);
+                               DMA_FROM_DEVICE);
                priv->rx[i].rxd2 |= RX_DMA_LSO;
                priv->rx_skb[i] = new_skb;
        }
-       dma_cache_wback_inv((unsigned long)priv->rx,
-               NUM_RX_DESC * (sizeof(struct ramips_rx_dma)));
+
+       return 0;
+}
+
+static void
+ramips_setup_dma(struct net_device *dev)
+{
+       struct raeth_priv *priv = netdev_priv(dev);
+
+       ramips_fe_wr(phys_to_bus(priv->phy_tx), 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(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 - 1), RAMIPS_RX_CALC_IDX0);
        ramips_fe_wr(RAMIPS_PST_DRX_IDX0, RAMIPS_PDMA_RST_CFG);
-
-       return 0;
 }
 
 static int
 ramips_eth_hard_start_xmit(struct sk_buff* skb, struct net_device *dev)
 {
-       struct raeth_priv *priv = (struct raeth_priv*)netdev_priv(dev);
+       struct raeth_priv *priv = netdev_priv(dev);
        unsigned long tx;
        unsigned int tx_next;
-
+       unsigned int mapped_addr;
        if(priv->plat->min_pkt_len)
        {
                if(skb->len < priv->plat->min_pkt_len)
@@ -125,7 +142,9 @@ ramips_eth_hard_start_xmit(struct sk_buff* skb, struct net_device *dev)
                 }
        }
        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,
+                       DMA_TO_DEVICE);
+       dma_sync_single_for_device(NULL, mapped_addr, skb->len, DMA_TO_DEVICE);
        tx = ramips_fe_rr(RAMIPS_TX_CTX_IDX0);
        if(tx == NUM_TX_DESC - 1)
                tx_next = 0;
@@ -136,7 +155,7 @@ ramips_eth_hard_start_xmit(struct sk_buff* skb, struct net_device *dev)
                if(!(priv->tx[tx].txd2 & TX_DMA_DONE))
                {
                        kfree_skb(skb);
-                       priv->stat.tx_dropped++;
+                       dev->stats.tx_dropped++;
                        printk(KERN_ERR "%s: dropping\n", dev->name);
                        return 0;
                }
@@ -144,12 +163,12 @@ ramips_eth_hard_start_xmit(struct sk_buff* skb, struct net_device *dev)
                priv->tx[tx].txd2 &= ~(TX_DMA_PLEN0_MASK | TX_DMA_DONE);
                priv->tx[tx].txd2 |= TX_DMA_PLEN0(skb->len);
                ramips_fe_wr((tx + 1) % NUM_TX_DESC, RAMIPS_TX_CTX_IDX0);
-               priv->stat.tx_packets++;
-               priv->stat.tx_bytes += skb->len;
+               dev->stats.tx_packets++;
+               dev->stats.tx_bytes += skb->len;
                priv->tx_skb[tx] = skb;
                ramips_fe_wr((tx + 1) % NUM_TX_DESC, RAMIPS_TX_CTX_IDX0);
        } else {
-               priv->stat.tx_dropped++;
+               dev->stats.tx_dropped++;
                kfree_skb(skb);
        }
        return 0;
@@ -159,7 +178,7 @@ static void
 ramips_eth_rx_hw(unsigned long ptr)
 {
        struct net_device *dev = (struct net_device*)ptr;
-       struct raeth_priv *priv = (struct raeth_priv*)netdev_priv(dev);
+       struct raeth_priv *priv = netdev_priv(dev);
        int rx;
        int max_rx = 16;
 
@@ -178,8 +197,8 @@ ramips_eth_rx_hw(unsigned long ptr)
                rx_skb->dev = dev;
                rx_skb->protocol = eth_type_trans(rx_skb, dev);
                rx_skb->ip_summed = CHECKSUM_NONE;
-               priv->stat.rx_packets++;
-               priv->stat.rx_bytes += rx_skb->len;
+               dev->stats.rx_packets++;
+               dev->stats.rx_bytes += rx_skb->len;
                netif_rx(rx_skb);
 
                new_skb = __dev_alloc_skb(MAX_RX_LENGTH + 2, GFP_DMA | GFP_ATOMIC);
@@ -188,10 +207,8 @@ ramips_eth_rx_hw(unsigned long ptr)
                skb_reserve(new_skb, 2);
                priv->rx[rx].rxd1 =
                        dma_map_single(NULL, new_skb->data, MAX_RX_LENGTH + 2,
-                       PCI_DMA_FROMDEVICE);
+                       DMA_FROM_DEVICE);
                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);
        }
        if(max_rx == 0)
@@ -205,7 +222,7 @@ static void
 ramips_eth_tx_housekeeping(unsigned long ptr)
 {
        struct net_device *dev = (struct net_device*)ptr;
-       struct raeth_priv *priv = (struct raeth_priv*)netdev_priv(dev);
+       struct raeth_priv *priv = netdev_priv(dev);
 
        while((priv->tx[priv->skb_free_idx].txd2 & TX_DMA_DONE) &&
                (priv->tx_skb[priv->skb_free_idx]))
@@ -220,12 +237,6 @@ ramips_eth_tx_housekeeping(unsigned long ptr)
                RAMIPS_FE_INT_ENABLE);
 }
 
-static struct net_device_stats*
-ramips_eth_get_stats(struct net_device *dev)
-{
-       return &((struct raeth_priv*)netdev_priv(dev))->stat;
-}
-
 static int
 ramips_eth_set_mac_addr(struct net_device *dev, void *priv)
 {
@@ -243,16 +254,19 @@ ramips_eth_set_mac_addr(struct net_device *dev, void *priv)
 static void
 ramips_eth_timeout(struct net_device *dev)
 {
-       tasklet_schedule(
-               &((struct raeth_priv*)netdev_priv(dev))->tx_housekeeping_tasklet);
+       struct raeth_priv *priv = netdev_priv(dev);
+
+       tasklet_schedule(&priv->tx_housekeeping_tasklet);
 }
 
 static irqreturn_t
 ramips_eth_irq(int irq, void *dev)
 {
-       struct raeth_priv *priv = (struct raeth_priv*)netdev_priv(dev);
+       struct raeth_priv *priv = netdev_priv(dev);
        unsigned long fe_int = ramips_fe_rr(RAMIPS_FE_INT_STATUS);
 
+       ramips_fe_wr(0xFFFFFFFF, RAMIPS_FE_INT_STATUS);
+
        if(fe_int & RAMIPS_RX_DLY_INT)
        {
                ramips_fe_wr(ramips_fe_rr(RAMIPS_FE_INT_ENABLE) & ~(RAMIPS_RX_DLY_INT),
@@ -260,17 +274,17 @@ ramips_eth_irq(int irq, void *dev)
                tasklet_schedule(&priv->rx_tasklet);
        }
        if(fe_int & RAMIPS_TX_DLY_INT)
-               tasklet_schedule(&priv->tx_housekeeping_tasklet);
-       ramips_fe_wr(0xFFFFFFFF, RAMIPS_FE_INT_STATUS);
+               ramips_eth_tx_housekeeping((unsigned long)dev);
        return IRQ_HANDLED;
 }
 
 static int
 ramips_eth_open(struct net_device *dev)
 {
-       struct raeth_priv *priv = (struct raeth_priv*)netdev_priv(dev);
+       struct raeth_priv *priv = netdev_priv(dev);
 
        ramips_alloc_dma(dev);
+       ramips_setup_dma(dev);
        ramips_fe_wr((ramips_fe_rr(RAMIPS_PDMA_GLO_CFG) & 0xff) |
                (RAMIPS_TX_WB_DDONE | RAMIPS_RX_DMA_EN |
                RAMIPS_TX_DMA_EN | RAMIPS_PDMA_SIZE_4DWORDS),
@@ -301,7 +315,7 @@ ramips_eth_open(struct net_device *dev)
 static int
 ramips_eth_stop(struct net_device *dev)
 {
-       struct raeth_priv *priv = (struct raeth_priv*)netdev_priv(dev);
+       struct raeth_priv *priv = netdev_priv(dev);
 
        ramips_fe_wr(RAMIPS_PDMA_GLO_CFG, ramips_fe_rr(RAMIPS_PDMA_GLO_CFG) &
                ~(RAMIPS_TX_WB_DDONE | RAMIPS_RX_DMA_EN | RAMIPS_TX_DMA_EN));
@@ -309,18 +323,15 @@ ramips_eth_stop(struct net_device *dev)
        netif_stop_queue(dev);
        tasklet_kill(&priv->tx_housekeeping_tasklet);
        tasklet_kill(&priv->rx_tasklet);
-       pci_free_consistent(NULL, NUM_TX_DESC * sizeof(struct ramips_tx_dma),
-               priv->tx, priv->phy_tx);
-       pci_free_consistent(NULL, NUM_RX_DESC * sizeof(struct ramips_rx_dma),
-               priv->rx, priv->phy_rx);
-       printk(KERN_INFO "ramips_eth: stopped\n");
+       ramips_cleanup_dma(dev);
+       printk(KERN_DEBUG "ramips_eth: stopped\n");
        return 0;
 }
 
 static int __init
 ramips_eth_probe(struct net_device *dev)
 {
-       struct raeth_priv *priv = (struct raeth_priv*)netdev_priv(dev);
+       struct raeth_priv *priv = netdev_priv(dev);
        struct sockaddr addr;
 
        BUG_ON(!priv->plat->reset_fe);
@@ -333,7 +344,6 @@ ramips_eth_probe(struct net_device *dev)
        dev->open = ramips_eth_open;
        dev->stop = ramips_eth_stop;
        dev->hard_start_xmit = ramips_eth_hard_start_xmit;
-       dev->get_stats = ramips_eth_get_stats;
        dev->set_mac_address = ramips_eth_set_mac_addr;
        dev->mtu = MAX_RX_LENGTH;
        dev->tx_timeout = ramips_eth_timeout;
@@ -345,31 +355,62 @@ static int
 ramips_eth_plat_probe(struct platform_device *plat)
 {
        struct raeth_priv *priv;
-       struct ramips_eth_platform_data *data =
-               (struct ramips_eth_platform_data*)plat->dev.platform_data;
-       ramips_fe_base = ioremap_nocache(data->base_addr, PAGE_SIZE);
+       struct ramips_eth_platform_data *data = plat->dev.platform_data;
+       struct resource *res;
+       int err;
+
+       if (!data) {
+               dev_err(&plat->dev, "no platform data specified\n");
+               return -EINVAL;
+       }
+
+       res = platform_get_resource(plat, IORESOURCE_MEM, 0);
+       if (!res) {
+               dev_err(&plat->dev, "no memory resource found\n");
+               return -ENXIO;
+       }
+
+       ramips_fe_base = ioremap_nocache(res->start, res->end - res->start + 1);
        if(!ramips_fe_base)
                return -ENOMEM;
+
        ramips_dev = alloc_etherdev(sizeof(struct raeth_priv));
-       if(!ramips_dev)
-               return -ENOMEM;
+       if(!ramips_dev) {
+               dev_err(&plat->dev, "alloc_etherdev failed\n");
+               err = -ENOMEM;
+               goto err_unmap;
+       }
+
        strcpy(ramips_dev->name, "eth%d");
-       ramips_dev->irq = data->irq;
+       ramips_dev->irq = platform_get_irq(plat, 0);
+       if (ramips_dev->irq < 0) {
+               dev_err(&plat->dev, "no IRQ resource found\n");
+               err = -ENXIO;
+               goto err_free_dev;
+       }
        ramips_dev->addr_len = ETH_ALEN;
        ramips_dev->base_addr = (unsigned long)ramips_fe_base;
        ramips_dev->init = ramips_eth_probe;
        priv = (struct raeth_priv*)netdev_priv(ramips_dev);
        priv->plat = data;
-       if(register_netdev(ramips_dev))
-       {
-               printk(KERN_ERR "ramips_eth: error bringing up device\n");
-               return -ENXIO;
+
+       err = register_netdev(ramips_dev);
+       if (err) {
+               dev_err(&plat->dev, "error bringing up device\n");
+               goto err_free_dev;
        }
+
 #ifdef CONFIG_RALINK_RT305X
        rt305x_esw_init();
 #endif
-       printk(KERN_INFO "ramips_eth: loaded\n");
+       printk(KERN_DEBUG "ramips_eth: loaded\n");
        return 0;
+
+ err_free_dev:
+       kfree(ramips_dev);
+ err_unmap:
+       iounmap(ramips_fe_base);
+       return err;
 }
 
 static int
@@ -377,7 +418,7 @@ ramips_eth_plat_remove(struct platform_device *plat)
 {
        unregister_netdev(ramips_dev);
        free_netdev(ramips_dev);
-       printk(KERN_INFO "ramips_eth: unloaded");
+       printk(KERN_DEBUG "ramips_eth: unloaded\n");
        return 0;
 }
 
@@ -395,7 +436,8 @@ ramips_eth_init(void)
 {
        int ret = platform_driver_register(&ramips_eth_driver);
        if (ret)
-               printk(KERN_INFO "ramips_eth: Error registering platfom driver!");
+               printk(KERN_ERR
+                      "ramips_eth: Error registering platfom driver!\n");
        return ret;
 }