[target] stay coherent when defining ARCH

[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 0ba4d55..c8c61de 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -318,6 +318,7 @@ static void ag71xx_hw_set_macaddr(struct ag71xx *ag, unsigned char *mac)
 
 static void ag71xx_dma_reset(struct ag71xx *ag)
 {
 
 static void ag71xx_dma_reset(struct ag71xx *ag)
 {

+       u32 val;

        int i;
 
        ag71xx_dump_dma_regs(ag);
        int i;
 
        ag71xx_dump_dma_regs(ag);


@@ -340,13 +341,19 @@ static void ag71xx_dma_reset(struct ag71xx *ag)
        ag71xx_wr(ag, AG71XX_REG_RX_STATUS, RX_STATUS_BE | RX_STATUS_OF);
        ag71xx_wr(ag, AG71XX_REG_TX_STATUS, TX_STATUS_BE | TX_STATUS_UR);
 
        ag71xx_wr(ag, AG71XX_REG_RX_STATUS, RX_STATUS_BE | RX_STATUS_OF);
        ag71xx_wr(ag, AG71XX_REG_TX_STATUS, TX_STATUS_BE | TX_STATUS_UR);
 

-       if (ag71xx_rr(ag, AG71XX_REG_RX_STATUS))
-               printk(KERN_ALERT "%s: unable to clear DMA Rx status\n",
-                       ag->dev->name);
+       val = ag71xx_rr(ag, AG71XX_REG_RX_STATUS);
+       if (val)
+               printk(KERN_ALERT "%s: unable to clear DMA Rx status: %08x\n",
+                       ag->dev->name, val);

 
 

-       if (ag71xx_rr(ag, AG71XX_REG_TX_STATUS))
-               printk(KERN_ALERT "%s: unable to clear DMA Tx status\n",
-                       ag->dev->name);
+       val = ag71xx_rr(ag, AG71XX_REG_TX_STATUS);
+
+       /* mask out reserved bits */
+       val &= ~0xff000000;
+
+       if (val)
+               printk(KERN_ALERT "%s: unable to clear DMA Tx status: %08x\n",
+                       ag->dev->name, val);

 
        ag71xx_dump_dma_regs(ag);
 }
 
        ag71xx_dump_dma_regs(ag);
 }


@@ -395,8 +402,13 @@ static void ag71xx_hw_init(struct ag71xx *ag)
 
        /* setup FIFO configuration registers */
        ag71xx_wr(ag, AG71XX_REG_FIFO_CFG0, FIFO_CFG0_INIT);
 
        /* setup FIFO configuration registers */
        ag71xx_wr(ag, AG71XX_REG_FIFO_CFG0, FIFO_CFG0_INIT);

-       ag71xx_wr(ag, AG71XX_REG_FIFO_CFG1, 0x0fff0000);
-       ag71xx_wr(ag, AG71XX_REG_FIFO_CFG2, 0x00001fff);
+       if (pdata->is_ar724x) {
+               ag71xx_wr(ag, AG71XX_REG_FIFO_CFG1, pdata->fifo_cfg1);
+               ag71xx_wr(ag, AG71XX_REG_FIFO_CFG2, pdata->fifo_cfg2);
+       } else {
+               ag71xx_wr(ag, AG71XX_REG_FIFO_CFG1, 0x0fff0000);
+               ag71xx_wr(ag, AG71XX_REG_FIFO_CFG2, 0x00001fff);
+       }

        ag71xx_wr(ag, AG71XX_REG_FIFO_CFG4, FIFO_CFG4_INIT);
        ag71xx_wr(ag, AG71XX_REG_FIFO_CFG5, FIFO_CFG5_INIT);
 
        ag71xx_wr(ag, AG71XX_REG_FIFO_CFG4, FIFO_CFG4_INIT);
        ag71xx_wr(ag, AG71XX_REG_FIFO_CFG5, FIFO_CFG5_INIT);
 


@@ -575,7 +587,7 @@ static void ag71xx_oom_timer_handler(unsigned long data)
        struct net_device *dev = (struct net_device *) data;
        struct ag71xx *ag = netdev_priv(dev);
 
        struct net_device *dev = (struct net_device *) data;
        struct ag71xx *ag = netdev_priv(dev);
 

-       netif_rx_schedule(dev, &ag->napi);
+       napi_schedule(&ag->napi);

 }
 
 static void ag71xx_tx_timeout(struct net_device *dev)
 }
 
 static void ag71xx_tx_timeout(struct net_device *dev)


@@ -731,7 +743,7 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
                DBG("%s: disable polling mode, done=%d, limit=%d\n",
                        dev->name, done, limit);
 
                DBG("%s: disable polling mode, done=%d, limit=%d\n",
                        dev->name, done, limit);
 

-               netif_rx_complete(dev, napi);
+               napi_complete(napi);

 
                /* enable interrupts */
                spin_lock_irqsave(&ag->lock, flags);
 
                /* enable interrupts */
                spin_lock_irqsave(&ag->lock, flags);


@@ -750,7 +762,7 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
                printk(KERN_DEBUG "%s: out of memory\n", dev->name);
 
        mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL);
                printk(KERN_DEBUG "%s: out of memory\n", dev->name);
 
        mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL);

-       netif_rx_complete(dev, napi);
+       napi_complete(napi);

        return 0;
 }
 
        return 0;
 }
 


@@ -780,7 +792,7 @@ static irqreturn_t ag71xx_interrupt(int irq, void *dev_id)
        if (likely(status & AG71XX_INT_POLL)) {
                ag71xx_int_disable(ag, AG71XX_INT_POLL);
                DBG("%s: enable polling mode\n", dev->name);
        if (likely(status & AG71XX_INT_POLL)) {
                ag71xx_int_disable(ag, AG71XX_INT_POLL);
                DBG("%s: enable polling mode\n", dev->name);

-               netif_rx_schedule(dev, &ag->napi);
+               napi_schedule(&ag->napi);

        }
 
        return IRQ_HANDLED;
        }
 
        return IRQ_HANDLED;


@@ -791,6 +803,18 @@ static void ag71xx_set_multicast_list(struct net_device *dev)
        /* TODO */
 }
 
        /* TODO */
 }
 

+static const struct net_device_ops ag71xx_netdev_ops = {
+       .ndo_open               = ag71xx_open,
+       .ndo_stop               = ag71xx_stop,
+       .ndo_start_xmit         = ag71xx_hard_start_xmit,
+       .ndo_set_multicast_list = ag71xx_set_multicast_list,
+       .ndo_do_ioctl           = ag71xx_do_ioctl,
+       .ndo_tx_timeout         = ag71xx_tx_timeout,
+       .ndo_change_mtu         = eth_change_mtu,
+       .ndo_set_mac_address    = eth_mac_addr,
+       .ndo_validate_addr      = eth_validate_addr,
+};
+

 static int __init ag71xx_probe(struct platform_device *pdev)
 {
        struct net_device *dev;
 static int __init ag71xx_probe(struct platform_device *pdev)
 {
        struct net_device *dev;


@@ -806,6 +830,12 @@ static int __init ag71xx_probe(struct platform_device *pdev)
                goto err_out;
        }
 
                goto err_out;
        }
 

+       if (pdata->mii_bus_dev == NULL) {
+               dev_err(&pdev->dev, "no MII bus device specified\n");
+               err = -EINVAL;
+               goto err_out;
+       }
+

        dev = alloc_etherdev(sizeof(*ag));
        if (!dev) {
                dev_err(&pdev->dev, "alloc_etherdev failed\n");
        dev = alloc_etherdev(sizeof(*ag));
        if (!dev) {
                dev_err(&pdev->dev, "alloc_etherdev failed\n");


@@ -818,7 +848,6 @@ static int __init ag71xx_probe(struct platform_device *pdev)
        ag = netdev_priv(dev);
        ag->pdev = pdev;
        ag->dev = dev;
        ag = netdev_priv(dev);
        ag->pdev = pdev;
        ag->dev = dev;

-       ag->mii_bus = ag71xx_mdio_bus->mii_bus;

        ag->msg_enable = netif_msg_init(ag71xx_msg_level,
                                        AG71XX_DEFAULT_MSG_ENABLE);
        spin_lock_init(&ag->lock);
        ag->msg_enable = netif_msg_init(ag71xx_msg_level,
                                        AG71XX_DEFAULT_MSG_ENABLE);
        spin_lock_init(&ag->lock);


@@ -837,32 +866,18 @@ static int __init ag71xx_probe(struct platform_device *pdev)
                goto err_free_dev;
        }
 
                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;
        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;
        }
 
        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);
        }
 
        dev->irq = platform_get_irq(pdev, 0);


@@ -875,14 +890,9 @@ static int __init ag71xx_probe(struct platform_device *pdev)
        }
 
        dev->base_addr = (unsigned long)ag->mac_base;
        }
 
        dev->base_addr = (unsigned long)ag->mac_base;

-       dev->open = ag71xx_open;
-       dev->stop = ag71xx_stop;
-       dev->hard_start_xmit = ag71xx_hard_start_xmit;
-       dev->set_multicast_list = ag71xx_set_multicast_list;
-       dev->do_ioctl = ag71xx_do_ioctl;
+       dev->netdev_ops = &ag71xx_netdev_ops;

        dev->ethtool_ops = &ag71xx_ethtool_ops;
 
        dev->ethtool_ops = &ag71xx_ethtool_ops;
 

-       dev->tx_timeout = ag71xx_tx_timeout;

        INIT_WORK(&ag->restart_work, ag71xx_restart_work_func);
 
        init_timer(&ag->oom_timer);
        INIT_WORK(&ag->restart_work, ag71xx_restart_work_func);
 
        init_timer(&ag->oom_timer);


@@ -908,13 +918,6 @@ static int __init ag71xx_probe(struct platform_device *pdev)
 
        ag71xx_dump_regs(ag);
 
 
        ag71xx_dump_regs(ag);
 

-       /* Reset the mdio bus explicitly */
-       if (ag->mii_bus) {
-               mutex_lock(&ag->mii_bus->mdio_lock);
-               ag->mii_bus->reset(ag->mii_bus);
-               mutex_unlock(&ag->mii_bus->mdio_lock);
-       }
-

        err = ag71xx_phy_connect(ag);
        if (err)
                goto err_unregister_netdev;
        err = ag71xx_phy_connect(ag);
        if (err)
                goto err_unregister_netdev;


@@ -929,9 +932,7 @@ static int __init ag71xx_probe(struct platform_device *pdev)
        free_irq(dev->irq, dev);
  err_unmap_mii_ctrl:
        iounmap(ag->mii_ctrl);
        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);
        iounmap(ag->mac_base);
  err_free_dev:
        kfree(dev);


@@ -951,7 +952,6 @@ static int __exit ag71xx_remove(struct platform_device *pdev)
                unregister_netdev(dev);
                free_irq(dev->irq, dev);
                iounmap(ag->mii_ctrl);
                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);
                iounmap(ag->mac_base);
                kfree(dev);
                platform_set_drvdata(pdev, NULL);