ar71xx: update mdio_reset code

[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 6302bf6..57f6b34 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -11,6 +11,7 @@
  *  by the Free Software Foundation.
  */
 
+#include <linux/cache.h>
 #include "ag71xx.h"
 
 #define AG71XX_DEFAULT_MSG_ENABLE      \
@@ -23,10 +24,10 @@
        | NETIF_MSG_RX_ERR              \
        | NETIF_MSG_TX_ERR )
 
-static int ag71xx_debug = -1;
+static int ag71xx_msg_level = -1;
 
-module_param(ag71xx_debug, int, 0);
-MODULE_PARM_DESC(ag71xx_debug, "Debug level (-1=defaults,0=none,...,16=all)");
+module_param_named(msg_level, ag71xx_msg_level, int, 0);
+MODULE_PARM_DESC(msg_level, "Message level (-1=defaults,0=none,...,16=all)");
 
 static void ag71xx_dump_dma_regs(struct ag71xx *ag)
 {
@@ -86,7 +87,7 @@ static void ag71xx_ring_free(struct ag71xx_ring *ring)
        kfree(ring->buf);
 
        if (ring->descs_cpu)
-               dma_free_coherent(NULL, ring->size * sizeof(struct ag71xx_desc),
+               dma_free_coherent(NULL, ring->size * ring->desc_size,
                                  ring->descs_cpu, ring->descs_dma);
 }
 
@@ -95,10 +96,16 @@ static int ag71xx_ring_alloc(struct ag71xx_ring *ring, unsigned int size)
        int err;
        int i;
 
-       ring->descs_cpu = dma_alloc_coherent(NULL,
-                                            size * sizeof(struct ag71xx_desc),
-                                            &ring->descs_dma,
-                                            GFP_ATOMIC);
+       ring->desc_size = sizeof(struct ag71xx_desc);
+       if (ring->desc_size % cache_line_size()) {
+               DBG("ag71xx: ring %p, desc size %u rounded to %u\n",
+                       ring, ring->desc_size,
+                       roundup(ring->desc_size, cache_line_size()));
+               ring->desc_size = roundup(ring->desc_size, cache_line_size());
+       }
+
+       ring->descs_cpu = dma_alloc_coherent(NULL, size * ring->desc_size,
+                                            &ring->descs_dma, GFP_ATOMIC);
        if (!ring->descs_cpu) {
                err = -ENOMEM;
                goto err;
@@ -113,8 +120,9 @@ static int ag71xx_ring_alloc(struct ag71xx_ring *ring, unsigned int size)
        }
 
        for (i = 0; i < size; i++) {
-               struct ag71xx_desc *descs = (struct ag71xx_desc *) ring->descs_cpu;
-               ring->buf[i].desc = &descs[i];
+               ring->buf[i].desc = (struct ag71xx_desc *)&ring->descs_cpu[i * ring->desc_size];
+               DBG("ag71xx: ring %p, desc %d at %p\n",
+                       ring, i, ring->buf[i].desc);
        }
 
        return 0;
@@ -156,7 +164,7 @@ static void ag71xx_ring_tx_init(struct ag71xx *ag)
 
        for (i = 0; i < AG71XX_TX_RING_SIZE; i++) {
                ring->buf[i].desc->next = (u32) (ring->descs_dma +
-                       sizeof(struct ag71xx_desc) * ((i + 1) % AG71XX_TX_RING_SIZE));
+                       ring->desc_size * ((i + 1) % AG71XX_TX_RING_SIZE));
 
                ring->buf[i].desc->ctrl = DESC_EMPTY;
                ring->buf[i].skb = NULL;
@@ -190,9 +198,14 @@ static int ag71xx_ring_rx_init(struct ag71xx *ag)
        int ret;
 
        ret = 0;
-       for (i = 0; i < AG71XX_RX_RING_SIZE; i++)
+       for (i = 0; i < AG71XX_RX_RING_SIZE; i++) {
                ring->buf[i].desc->next = (u32) (ring->descs_dma +
-                       sizeof(struct ag71xx_desc) * ((i + 1) % AG71XX_RX_RING_SIZE));
+                       ring->desc_size * ((i + 1) % AG71XX_RX_RING_SIZE));
+
+               DBG("ag71xx: RX desc at %p, next is %08x\n",
+                       ring->buf[i].desc,
+                       ring->buf[i].desc->next);
+       }
 
        for (i = 0; i < AG71XX_RX_RING_SIZE; i++) {
                struct sk_buff *skb;
@@ -806,7 +819,7 @@ static int __init ag71xx_probe(struct platform_device *pdev)
        ag->pdev = pdev;
        ag->dev = dev;
        ag->mii_bus = ag71xx_mdio_bus->mii_bus;
-       ag->msg_enable = netif_msg_init(ag71xx_debug,
+       ag->msg_enable = netif_msg_init(ag71xx_msg_level,
                                        AG71XX_DEFAULT_MSG_ENABLE);
        spin_lock_init(&ag->lock);
 
@@ -824,32 +837,18 @@ static int __init ag71xx_probe(struct platform_device *pdev)
                goto err_free_dev;
        }
 
-       res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mac_base2");
-       if (!res) {
-               dev_err(&pdev->dev, "no mac_base2 resource found\n");
-               err = -ENXIO;
-               goto err_unmap_base1;
-       }
-
-       ag->mac_base2 = ioremap_nocache(res->start, res->end - res->start + 1);
-       if (!ag->mac_base) {
-               dev_err(&pdev->dev, "unable to ioremap mac_base2\n");
-               err = -ENOMEM;
-               goto err_unmap_base1;
-       }
-
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mii_ctrl");
        if (!res) {
                dev_err(&pdev->dev, "no mii_ctrl resource found\n");
                err = -ENXIO;
-               goto err_unmap_base2;
+               goto err_unmap_base;
        }
 
        ag->mii_ctrl = ioremap_nocache(res->start, res->end - res->start + 1);
        if (!ag->mii_ctrl) {
                dev_err(&pdev->dev, "unable to ioremap mii_ctrl\n");
                err = -ENOMEM;
-               goto err_unmap_base2;
+               goto err_unmap_base;
        }
 
        dev->irq = platform_get_irq(pdev, 0);
@@ -916,9 +915,7 @@ static int __init ag71xx_probe(struct platform_device *pdev)
        free_irq(dev->irq, dev);
  err_unmap_mii_ctrl:
        iounmap(ag->mii_ctrl);
- err_unmap_base2:
-       iounmap(ag->mac_base2);
- err_unmap_base1:
+ err_unmap_base:
        iounmap(ag->mac_base);
  err_free_dev:
        kfree(dev);
@@ -938,7 +935,6 @@ static int __exit ag71xx_remove(struct platform_device *pdev)
                unregister_netdev(dev);
                free_irq(dev->irq, dev);
                iounmap(ag->mii_ctrl);
-               iounmap(ag->mac_base2);
                iounmap(ag->mac_base);
                kfree(dev);
                platform_set_drvdata(pdev, NULL);