fixes licenses

[oweals/openwrt.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 338fa53992818a8a3811624321bb56efab938da5..d3337da2008ede6f403f1dbfb98f515406255d65 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ramips.c
+++ b/target/linux/ramips/files/drivers/net/ramips.c
@@ -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
@@ -39,6 +38,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;
 
@@ -57,15 +58,14 @@ ramips_fe_rr(unsigned reg)
 static int
 ramips_alloc_dma(struct net_device *dev)
 {
-#define phys_to_bus(a)  (a & 0x1FFFFFFF)
        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));
@@ -79,8 +79,8 @@ ramips_alloc_dma(struct net_device *dev)
        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++)
        {
@@ -93,9 +93,6 @@ ramips_alloc_dma(struct net_device *dev)
                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)));
-
        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);
@@ -110,7 +107,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;
        if(priv->plat->min_pkt_len)
        {
                if(skb->len < priv->plat->min_pkt_len)
@@ -125,7 +122,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,
+                       PCI_DMA_TODEVICE);
+       dma_sync_single_for_device(NULL, mapped_addr, skb->len, PCI_DMA_TODEVICE);
        tx = ramips_fe_rr(RAMIPS_TX_CTX_IDX0);
        if(tx == NUM_TX_DESC - 1)
                tx_next = 0;
@@ -136,7 +135,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 +143,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;
@@ -178,8 +177,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);
@@ -190,8 +189,6 @@ ramips_eth_rx_hw(unsigned long ptr)
                        dma_map_single(NULL, new_skb->data, MAX_RX_LENGTH + 2,
                        PCI_DMA_FROMDEVICE);
                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)
@@ -220,14 +217,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)
-{
-       struct raeth_priv *priv = netdev_priv(dev);
-
-       return &priv->stat;
-}
-
 static int
 ramips_eth_set_mac_addr(struct net_device *dev, void *priv)
 {
@@ -256,6 +245,8 @@ ramips_eth_irq(int irq, void *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),
@@ -263,8 +254,7 @@ 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;
 }
 
@@ -336,7 +326,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;