ar71xx: rewrite WNDR3700/3800 handling

[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 ee76c9a..3ebf4b1 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -444,9 +444,6 @@ static void ag71xx_hw_setup(struct ag71xx *ag)
        /* setup max frame length */
        ag71xx_wr(ag, AG71XX_REG_MAC_MFL, AG71XX_TX_MTU_LEN);
 
        /* setup max frame length */
        ag71xx_wr(ag, AG71XX_REG_MAC_MFL, AG71XX_TX_MTU_LEN);
 

-       /* setup MII interface type */
-       ag71xx_mii_ctrl_set_if(ag, pdata->mii_if);
-

        /* setup FIFO configuration registers */
        ag71xx_wr(ag, AG71XX_REG_FIFO_CFG0, FIFO_CFG0_INIT);
        if (pdata->is_ar724x) {
        /* setup FIFO configuration registers */
        ag71xx_wr(ag, AG71XX_REG_FIFO_CFG0, FIFO_CFG0_INIT);
        if (pdata->is_ar724x) {


@@ -536,7 +533,6 @@ void ag71xx_link_adjust(struct ag71xx *ag)
        u32 cfg2;
        u32 ifctl;
        u32 fifo5;
        u32 cfg2;
        u32 ifctl;
        u32 fifo5;

-       u32 mii_speed;

 
        if (!ag->link) {
                ag71xx_hw_stop(ag);
 
        if (!ag->link) {
                ag71xx_hw_stop(ag);


@@ -561,17 +557,14 @@ void ag71xx_link_adjust(struct ag71xx *ag)
 
        switch (ag->speed) {
        case SPEED_1000:
 
        switch (ag->speed) {
        case SPEED_1000:

-               mii_speed =  MII_CTRL_SPEED_1000;

                cfg2 |= MAC_CFG2_IF_1000;
                fifo5 |= FIFO_CFG5_BM;
                break;
        case SPEED_100:
                cfg2 |= MAC_CFG2_IF_1000;
                fifo5 |= FIFO_CFG5_BM;
                break;
        case SPEED_100:

-               mii_speed = MII_CTRL_SPEED_100;

                cfg2 |= MAC_CFG2_IF_10_100;
                ifctl |= MAC_IFCTL_SPEED;
                break;
        case SPEED_10:
                cfg2 |= MAC_CFG2_IF_10_100;
                ifctl |= MAC_IFCTL_SPEED;
                break;
        case SPEED_10:

-               mii_speed = MII_CTRL_SPEED_10;

                cfg2 |= MAC_CFG2_IF_10_100;
                break;
        default:
                cfg2 |= MAC_CFG2_IF_10_100;
                break;
        default:


@@ -586,10 +579,8 @@ void ag71xx_link_adjust(struct ag71xx *ag)
        else
                ag71xx_wr(ag, AG71XX_REG_FIFO_CFG3, 0x008001ff);
 
        else
                ag71xx_wr(ag, AG71XX_REG_FIFO_CFG3, 0x008001ff);
 

-       if (pdata->set_pll)
-               pdata->set_pll(ag->speed);
-
-       ag71xx_mii_ctrl_set_speed(ag, mii_speed);
+       if (pdata->set_speed)
+               pdata->set_speed(ag->speed);

 
        ag71xx_wr(ag, AG71XX_REG_MAC_CFG2, cfg2);
        ag71xx_wr(ag, AG71XX_REG_FIFO_CFG5, fifo5);
 
        ag71xx_wr(ag, AG71XX_REG_MAC_CFG2, cfg2);
        ag71xx_wr(ag, AG71XX_REG_FIFO_CFG5, fifo5);


@@ -805,9 +796,33 @@ static void ag71xx_restart_work_func(struct work_struct *work)
        ag71xx_open(ag->dev);
 }
 
        ag71xx_open(ag->dev);
 }
 

+static bool ag71xx_check_dma_stuck(struct ag71xx *ag, unsigned long timestamp)
+{
+       u32 rx_sm, tx_sm, rx_fd;
+
+       if (likely(time_before(jiffies, timestamp + HZ/10)))
+               return false;
+
+       if (!netif_carrier_ok(ag->dev))
+               return false;
+
+       rx_sm = ag71xx_rr(ag, AG71XX_REG_RX_SM);
+       if ((rx_sm & 0x7) == 0x3 && ((rx_sm >> 4) & 0x7) == 0x6)
+               return true;
+
+       tx_sm = ag71xx_rr(ag, AG71XX_REG_TX_SM);
+       rx_fd = ag71xx_rr(ag, AG71XX_REG_FIFO_DEPTH);
+       if (((tx_sm >> 4) & 0x7) == 0 && ((rx_sm & 0x7) == 0) &&
+           ((rx_sm >> 4) & 0x7) == 0 && rx_fd == 0)
+               return true;
+
+       return false;
+}
+

 static int ag71xx_tx_packets(struct ag71xx *ag)
 {
        struct ag71xx_ring *ring = &ag->tx_ring;
 static int ag71xx_tx_packets(struct ag71xx *ag)
 {
        struct ag71xx_ring *ring = &ag->tx_ring;

+       struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);

        int sent;
 
        DBG("%s: processing TX ring\n", ag->dev->name);
        int sent;
 
        DBG("%s: processing TX ring\n", ag->dev->name);


@@ -818,8 +833,12 @@ static int ag71xx_tx_packets(struct ag71xx *ag)
                struct ag71xx_desc *desc = ring->buf[i].desc;
                struct sk_buff *skb = ring->buf[i].skb;
 
                struct ag71xx_desc *desc = ring->buf[i].desc;
                struct sk_buff *skb = ring->buf[i].skb;
 

-               if (!ag71xx_desc_empty(desc))
+               if (!ag71xx_desc_empty(desc)) {
+                       if (pdata->is_ar7240 &&
+                           ag71xx_check_dma_stuck(ag, ring->buf[i].timestamp))
+                               schedule_work(&ag->restart_work);

                        break;
                        break;

+               }

 
                ag71xx_wr(ag, AG71XX_REG_TX_STATUS, TX_STATUS_PS);
 
 
                ag71xx_wr(ag, AG71XX_REG_TX_STATUS, TX_STATUS_PS);
 


@@ -1095,27 +1114,13 @@ static int __devinit ag71xx_probe(struct platform_device *pdev)
                goto err_free_dev;
        }
 
                goto err_free_dev;
        }
 

-       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_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_base;
-       }
-

        dev->irq = platform_get_irq(pdev, 0);
        err = request_irq(dev->irq, ag71xx_interrupt,
                          IRQF_DISABLED,
                          dev->name, dev);
        if (err) {
                dev_err(&pdev->dev, "unable to request IRQ %d\n", dev->irq);
        dev->irq = platform_get_irq(pdev, 0);
        err = request_irq(dev->irq, ag71xx_interrupt,
                          IRQF_DISABLED,
                          dev->name, dev);
        if (err) {
                dev_err(&pdev->dev, "unable to request IRQ %d\n", dev->irq);

-               goto err_unmap_mii_ctrl;
+               goto err_unmap_base;

        }
 
        dev->base_addr = (unsigned long)ag->mac_base;
        }
 
        dev->base_addr = (unsigned long)ag->mac_base;


@@ -1181,8 +1186,6 @@ err_free_desc:
                          ag->stop_desc_dma);
 err_free_irq:
        free_irq(dev->irq, dev);
                          ag->stop_desc_dma);
 err_free_irq:
        free_irq(dev->irq, dev);

-err_unmap_mii_ctrl:
-       iounmap(ag->mii_ctrl);

 err_unmap_base:
        iounmap(ag->mac_base);
 err_free_dev:
 err_unmap_base:
        iounmap(ag->mac_base);
 err_free_dev:


@@ -1203,7 +1206,6 @@ static int __devexit ag71xx_remove(struct platform_device *pdev)
                ag71xx_phy_disconnect(ag);
                unregister_netdev(dev);
                free_irq(dev->irq, dev);
                ag71xx_phy_disconnect(ag);
                unregister_netdev(dev);
                free_irq(dev->irq, dev);

-               iounmap(ag->mii_ctrl);

                iounmap(ag->mac_base);
                kfree(dev);
                platform_set_drvdata(pdev, NULL);
                iounmap(ag->mac_base);
                kfree(dev);
                platform_set_drvdata(pdev, NULL);