projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ar71xx: add initial support for the Atheros DB120 board
[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 a3b5f95..eae443e 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -14,14 +14,14 @@
 #include "ag71xx.h"
 
 #define AG71XX_DEFAULT_MSG_ENABLE      \
 #include "ag71xx.h"
 
 #define AG71XX_DEFAULT_MSG_ENABLE      \
-       ( NETIF_MSG_DRV                 \
+       (NETIF_MSG_DRV                  \
        | NETIF_MSG_PROBE               \
        | NETIF_MSG_LINK                \
        | NETIF_MSG_TIMER               \
        | NETIF_MSG_IFDOWN              \
        | NETIF_MSG_IFUP                \
        | NETIF_MSG_RX_ERR              \
        | NETIF_MSG_PROBE               \
        | NETIF_MSG_LINK                \
        | NETIF_MSG_TIMER               \
        | NETIF_MSG_IFDOWN              \
        | NETIF_MSG_IFUP                \
        | NETIF_MSG_RX_ERR              \
-       | NETIF_MSG_TX_ERR )
+       | NETIF_MSG_TX_ERR)
 
 static int ag71xx_msg_level = -1;
 
 
 static int ag71xx_msg_level = -1;
 
@@ -119,14 +119,15 @@ static int ag71xx_ring_alloc(struct ag71xx_ring *ring, unsigned int size)
        }
 
        for (i = 0; i < size; i++) {
        }
 
        for (i = 0; i < size; i++) {
-               ring->buf[i].desc = (struct ag71xx_desc *)&ring->descs_cpu[i * ring->desc_size];
+               int idx = i * ring->desc_size;
+               ring->buf[i].desc = (struct ag71xx_desc *)&ring->descs_cpu[idx];
                DBG("ag71xx: ring %p, desc %d at %p\n",
                        ring, i, ring->buf[i].desc);
        }
 
        return 0;
 
                DBG("ag71xx: ring %p, desc %d at %p\n",
                        ring, i, ring->buf[i].desc);
        }
 
        return 0;
 
- err:
+err:
        return err;
 }
 
        return err;
 }
 
@@ -454,6 +455,12 @@ static void ag71xx_dma_reset(struct ag71xx *ag)
        ag71xx_wr(ag, AG71XX_REG_RX_CTRL, 0);
        ag71xx_wr(ag, AG71XX_REG_TX_CTRL, 0);
 
        ag71xx_wr(ag, AG71XX_REG_RX_CTRL, 0);
        ag71xx_wr(ag, AG71XX_REG_TX_CTRL, 0);
 
+       /*
+        * give the hardware some time to really stop all rx/tx activity
+        * clearing the descriptors too early causes random memory corruption
+        */
+       mdelay(1);
+
        /* clear descriptor addresses */
        ag71xx_wr(ag, AG71XX_REG_TX_DESC, 0);
        ag71xx_wr(ag, AG71XX_REG_RX_DESC, 0);
        /* clear descriptor addresses */
        ag71xx_wr(ag, AG71XX_REG_TX_DESC, 0);
        ag71xx_wr(ag, AG71XX_REG_RX_DESC, 0);
@@ -589,7 +596,7 @@ static int ag71xx_open(struct net_device *dev)
 
        return 0;
 
 
        return 0;
 
- err:
+err:
        ag71xx_rings_cleanup(ag);
        return ret;
 }
        ag71xx_rings_cleanup(ag);
        return ret;
 }
@@ -666,7 +673,7 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
 
        return NETDEV_TX_OK;
 
 
        return NETDEV_TX_OK;
 
- err_drop:
+err_drop:
        dev->stats.tx_dropped++;
 
        dev_kfree_skb(skb);
        dev->stats.tx_dropped++;
 
        dev_kfree_skb(skb);
@@ -675,7 +682,6 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
 
 static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
 
 static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
-       struct mii_ioctl_data *data = (struct mii_ioctl_data *) &ifr->ifr_data;
        struct ag71xx *ag = netdev_priv(dev);
        int ret;
 
        struct ag71xx *ag = netdev_priv(dev);
        int ret;
 
@@ -707,7 +713,7 @@ static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                if (ag->phy_dev == NULL)
                        break;
 
                if (ag->phy_dev == NULL)
                        break;
 
-               return phy_mii_ioctl(ag->phy_dev, data, cmd);
+               return phy_mii_ioctl(ag->phy_dev, ifr, cmd);
 
        default:
                break;
 
        default:
                break;
@@ -737,8 +743,13 @@ static void ag71xx_tx_timeout(struct net_device *dev)
 static void ag71xx_restart_work_func(struct work_struct *work)
 {
        struct ag71xx *ag = container_of(work, struct ag71xx, restart_work);
 static void ag71xx_restart_work_func(struct work_struct *work)
 {
        struct ag71xx *ag = container_of(work, struct ag71xx, restart_work);
+       struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
 
        ag71xx_stop(ag->dev);
 
        ag71xx_stop(ag->dev);
+
+       if (pdata->is_ar724x)
+               ag71xx_hw_init(ag);
+
        ag71xx_open(ag->dev);
 }
 
        ag71xx_open(ag->dev);
 }
 
@@ -778,28 +789,6 @@ static int ag71xx_tx_packets(struct ag71xx *ag)
        return sent;
 }
 
        return sent;
 }
 
-static void ag71xx_rx_align_skb(struct ag71xx *ag, struct sk_buff *skb, int len)
-{
-       int offset = ((unsigned long) skb->data) % 4;
-       void *data;
-
-       if (offset == 2)
-               return;
-
-       if (ag->phy_dev && ag->phy_dev->pkt_align != 0)
-               return;
-
-       if (len > 128)
-               return;
-
-       if (WARN_ON(skb_headroom(skb) < 2))
-               return;
-
-       data = skb->data;
-       skb->data -= 2;
-       memmove(skb->data, data, len);
-}
-
 static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
 {
        struct net_device *dev = ag->dev;
 static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
 {
        struct net_device *dev = ag->dev;
@@ -841,8 +830,6 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
                if (ag71xx_has_ar8216(ag))
                        err = ag71xx_remove_ar8216_header(ag, skb, pktlen);
 
                if (ag71xx_has_ar8216(ag))
                        err = ag71xx_remove_ar8216_header(ag, skb, pktlen);
 
-               ag71xx_rx_align_skb(ag, skb, pktlen);
-
                if (err) {
                        dev->stats.rx_dropped++;
                        kfree_skb(skb);
                if (err) {
                        dev->stats.rx_dropped++;
                        kfree_skb(skb);
@@ -923,12 +910,12 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
                return rx_done;
        }
 
                return rx_done;
        }
 
- more:
+more:
        DBG("%s: stay in polling mode, rx=%d, tx=%d, limit=%d\n",
                        dev->name, rx_done, tx_done, limit);
        return rx_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:
+oom:
        if (netif_msg_rx_err(ag))
                printk(KERN_DEBUG "%s: out of memory\n", dev->name);
 
        if (netif_msg_rx_err(ag))
                printk(KERN_DEBUG "%s: out of memory\n", dev->name);
 
@@ -1005,7 +992,7 @@ static const struct net_device_ops ag71xx_netdev_ops = {
 #endif
 };
 
 #endif
 };
 
-static int __init ag71xx_probe(struct platform_device *pdev)
+static int __devinit ag71xx_probe(struct platform_device *pdev)
 {
        struct net_device *dev;
        struct resource *res;
 {
        struct net_device *dev;
        struct resource *res;
@@ -1072,7 +1059,7 @@ static int __init ag71xx_probe(struct platform_device *pdev)
 
        dev->irq = platform_get_irq(pdev, 0);
        err = request_irq(dev->irq, ag71xx_interrupt,
 
        dev->irq = platform_get_irq(pdev, 0);
        err = request_irq(dev->irq, ag71xx_interrupt,
-                         IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
+                         IRQF_DISABLED,
                          dev->name, dev);
        if (err) {
                dev_err(&pdev->dev, "unable to request IRQ %d\n", dev->irq);
                          dev->name, dev);
        if (err) {
                dev_err(&pdev->dev, "unable to request IRQ %d\n", dev->irq);
@@ -1120,24 +1107,24 @@ static int __init ag71xx_probe(struct platform_device *pdev)
 
        return 0;
 
 
        return 0;
 
- err_phy_disconnect:
+err_phy_disconnect:
        ag71xx_phy_disconnect(ag);
        ag71xx_phy_disconnect(ag);
- err_unregister_netdev:
+err_unregister_netdev:
        unregister_netdev(dev);
        unregister_netdev(dev);
- err_free_irq:
+err_free_irq:
        free_irq(dev->irq, dev);
        free_irq(dev->irq, dev);
- err_unmap_mii_ctrl:
+err_unmap_mii_ctrl:
        iounmap(ag->mii_ctrl);
        iounmap(ag->mii_ctrl);
- err_unmap_base:
+err_unmap_base:
        iounmap(ag->mac_base);
        iounmap(ag->mac_base);
- err_free_dev:
+err_free_dev:
        kfree(dev);
        kfree(dev);
- err_out:
+err_out:
        platform_set_drvdata(pdev, NULL);
        return err;
 }
 
        platform_set_drvdata(pdev, NULL);
        return err;
 }
 
-static int __exit ag71xx_remove(struct platform_device *pdev)
+static int __devexit ag71xx_remove(struct platform_device *pdev)
 {
        struct net_device *dev = platform_get_drvdata(pdev);
 
 {
        struct net_device *dev = platform_get_drvdata(pdev);
 
@@ -1183,11 +1170,11 @@ static int __init ag71xx_module_init(void)
 
        return 0;
 
 
        return 0;
 
- err_mdio_exit:
+err_mdio_exit:
        ag71xx_mdio_driver_exit();
        ag71xx_mdio_driver_exit();
- err_debugfs_exit:
+err_debugfs_exit:
        ag71xx_debugfs_root_exit();
        ag71xx_debugfs_root_exit();
- err_out:
+err_out:
        return ret;
 }
 
        return ret;
 }
 
Personal OpenWRT clone
This page took 0.03179 seconds and 4 git commands to generate.