ar71xx: improve 2.6.36 compatibility. also, instead of adding a forward port patch...

[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 b1fb21f..45dd3e5 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -185,14 +185,35 @@ static void ag71xx_ring_rx_clean(struct ag71xx *ag)
                return;
 
        for (i = 0; i < AG71XX_RX_RING_SIZE; i++)
                return;
 
        for (i = 0; i < AG71XX_RX_RING_SIZE; i++)

-               if (ring->buf[i].skb)
+               if (ring->buf[i].skb) {
+                       dma_unmap_single(&ag->dev->dev, ring->buf[i].dma_addr,
+                                        AG71XX_RX_PKT_SIZE, DMA_FROM_DEVICE);

                        kfree_skb(ring->buf[i].skb);
                        kfree_skb(ring->buf[i].skb);

+               }
+}
+
+static int ag71xx_rx_reserve(struct ag71xx *ag)
+{
+       int reserve = 0;
+
+       if (ag71xx_get_pdata(ag)->is_ar724x) {
+               if (!ag71xx_has_ar8216(ag))
+                       reserve = 2;
+
+               if (ag->phy_dev)
+                       reserve += 4 - (ag->phy_dev->pkt_align % 4);
+
+               reserve %= 4;
+       }

 
 

+       return reserve + AG71XX_RX_PKT_RESERVE;

 }
 
 }
 

+

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

+       unsigned int reserve = ag71xx_rx_reserve(ag);

        unsigned int i;
        int ret;
 
        unsigned int i;
        int ret;
 


@@ -210,18 +231,20 @@ static int ag71xx_ring_rx_init(struct ag71xx *ag)
                struct sk_buff *skb;
                dma_addr_t dma_addr;
 
                struct sk_buff *skb;
                dma_addr_t dma_addr;
 

-               skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE + AG71XX_RX_PKT_RESERVE);
+               skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE + reserve);

                if (!skb) {
                        ret = -ENOMEM;
                        break;
                }
 
                skb->dev = ag->dev;
                if (!skb) {
                        ret = -ENOMEM;
                        break;
                }
 
                skb->dev = ag->dev;

-               skb_reserve(skb, AG71XX_RX_PKT_RESERVE);
+               skb_reserve(skb, reserve);

 
 

-               dma_addr = dma_map_single(NULL, skb->data, AG71XX_RX_PKT_SIZE,
+               dma_addr = dma_map_single(&ag->dev->dev, skb->data,
+                                         AG71XX_RX_PKT_SIZE,

                                          DMA_FROM_DEVICE);
                ring->buf[i].skb = skb;
                                          DMA_FROM_DEVICE);
                ring->buf[i].skb = skb;

+               ring->buf[i].dma_addr = dma_addr;

                ring->buf[i].desc->data = (u32) dma_addr;
                ring->buf[i].desc->ctrl = DESC_EMPTY;
        }
                ring->buf[i].desc->data = (u32) dma_addr;
                ring->buf[i].desc->ctrl = DESC_EMPTY;
        }


@@ -238,6 +261,7 @@ static int ag71xx_ring_rx_init(struct ag71xx *ag)
 static int ag71xx_ring_rx_refill(struct ag71xx *ag)
 {
        struct ag71xx_ring *ring = &ag->rx_ring;
 static int ag71xx_ring_rx_refill(struct ag71xx *ag)
 {
        struct ag71xx_ring *ring = &ag->rx_ring;

+       unsigned int reserve = ag71xx_rx_reserve(ag);

        unsigned int count;
 
        count = 0;
        unsigned int count;
 
        count = 0;


@@ -250,19 +274,19 @@ static int ag71xx_ring_rx_refill(struct ag71xx *ag)
                        dma_addr_t dma_addr;
                        struct sk_buff *skb;
 
                        dma_addr_t dma_addr;
                        struct sk_buff *skb;
 

-                       skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE +
-                                           AG71XX_RX_PKT_RESERVE);
+                       skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE + reserve);

                        if (skb == NULL)
                                break;
 
                        if (skb == NULL)
                                break;
 

-                       skb_reserve(skb, AG71XX_RX_PKT_RESERVE);
+                       skb_reserve(skb, reserve);

                        skb->dev = ag->dev;
 
                        skb->dev = ag->dev;
 

-                       dma_addr = dma_map_single(NULL, skb->data,
+                       dma_addr = dma_map_single(&ag->dev->dev, skb->data,

                                                  AG71XX_RX_PKT_SIZE,
                                                  DMA_FROM_DEVICE);
 
                        ring->buf[i].skb = skb;
                                                  AG71XX_RX_PKT_SIZE,
                                                  DMA_FROM_DEVICE);
 
                        ring->buf[i].skb = skb;

+                       ring->buf[i].dma_addr = dma_addr;

                        ring->buf[i].desc->data = (u32) dma_addr;
                }
 
                        ring->buf[i].desc->data = (u32) dma_addr;
                }
 


@@ -305,16 +329,117 @@ static void ag71xx_rings_cleanup(struct ag71xx *ag)
        ag71xx_ring_free(&ag->tx_ring);
 }
 
        ag71xx_ring_free(&ag->tx_ring);
 }
 

+static unsigned char *ag71xx_speed_str(struct ag71xx *ag)
+{
+       switch (ag->speed) {
+       case SPEED_1000:
+               return "1000";
+       case SPEED_100:
+               return "100";
+       case SPEED_10:
+               return "10";
+       }
+
+       return "?";
+}
+
+void ag71xx_link_adjust(struct ag71xx *ag)
+{
+       struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+       u32 cfg2;
+       u32 ifctl;
+       u32 fifo5;
+       u32 mii_speed;
+
+       if (!ag->link) {
+               netif_carrier_off(ag->dev);
+               if (netif_msg_link(ag))
+                       printk(KERN_INFO "%s: link down\n", ag->dev->name);
+               return;
+       }
+
+       cfg2 = ag71xx_rr(ag, AG71XX_REG_MAC_CFG2);
+       cfg2 &= ~(MAC_CFG2_IF_1000 | MAC_CFG2_IF_10_100 | MAC_CFG2_FDX);
+       cfg2 |= (ag->duplex) ? MAC_CFG2_FDX : 0;
+
+       ifctl = ag71xx_rr(ag, AG71XX_REG_MAC_IFCTL);
+       ifctl &= ~(MAC_IFCTL_SPEED);
+
+       fifo5 = ag71xx_rr(ag, AG71XX_REG_FIFO_CFG5);
+       fifo5 &= ~FIFO_CFG5_BM;
+
+       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:
+               mii_speed = MII_CTRL_SPEED_100;
+               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:
+               BUG();
+               return;
+       }
+
+       if (pdata->is_ar91xx)
+               ag71xx_wr(ag, AG71XX_REG_FIFO_CFG3, 0x00780fff);
+       else if (pdata->is_ar724x)
+               ag71xx_wr(ag, AG71XX_REG_FIFO_CFG3, pdata->fifo_cfg3);
+       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);
+
+       ag71xx_wr(ag, AG71XX_REG_MAC_CFG2, cfg2);
+       ag71xx_wr(ag, AG71XX_REG_FIFO_CFG5, fifo5);
+       ag71xx_wr(ag, AG71XX_REG_MAC_IFCTL, ifctl);
+
+       netif_carrier_on(ag->dev);
+       if (netif_msg_link(ag))
+               printk(KERN_INFO "%s: link up (%sMbps/%s duplex)\n",
+                       ag->dev->name,
+                       ag71xx_speed_str(ag),
+                       (DUPLEX_FULL == ag->duplex) ? "Full" : "Half");
+
+       DBG("%s: fifo_cfg0=%#x, fifo_cfg1=%#x, fifo_cfg2=%#x\n",
+               ag->dev->name,
+               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG0),
+               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG1),
+               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG2));
+
+       DBG("%s: fifo_cfg3=%#x, fifo_cfg4=%#x, fifo_cfg5=%#x\n",
+               ag->dev->name,
+               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG3),
+               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG4),
+               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG5));
+
+       DBG("%s: mac_cfg2=%#x, mac_ifctl=%#x, mii_ctrl=%#x\n",
+               ag->dev->name,
+               ag71xx_rr(ag, AG71XX_REG_MAC_CFG2),
+               ag71xx_rr(ag, AG71XX_REG_MAC_IFCTL),
+               ag71xx_mii_ctrl_rr(ag));
+}
+

 static void ag71xx_hw_set_macaddr(struct ag71xx *ag, unsigned char *mac)
 {
        u32 t;
 
 static void ag71xx_hw_set_macaddr(struct ag71xx *ag, unsigned char *mac)
 {
        u32 t;
 

-       t = (((u32) mac[0]) << 24) | (((u32) mac[1]) << 16)
-         | (((u32) mac[2]) << 8) | ((u32) mac[3]);
+       t = (((u32) mac[5]) << 24) | (((u32) mac[4]) << 16)
+         | (((u32) mac[3]) << 8) | ((u32) mac[2]);

 
        ag71xx_wr(ag, AG71XX_REG_MAC_ADDR1, t);
 
 
        ag71xx_wr(ag, AG71XX_REG_MAC_ADDR1, t);
 

-       t = (((u32) mac[4]) << 24) | (((u32) mac[5]) << 16);
+       t = (((u32) mac[1]) << 24) | (((u32) mac[0]) << 16);

        ag71xx_wr(ag, AG71XX_REG_MAC_ADDR2, t);
 }
 
        ag71xx_wr(ag, AG71XX_REG_MAC_ADDR2, t);
 }
 


@@ -329,6 +454,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);


@@ -442,12 +573,16 @@ static void ag71xx_hw_stop(struct ag71xx *ag)
 static int ag71xx_open(struct net_device *dev)
 {
        struct ag71xx *ag = netdev_priv(dev);
 static int ag71xx_open(struct net_device *dev)
 {
        struct ag71xx *ag = netdev_priv(dev);

+       struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);

        int ret;
 
        ret = ag71xx_rings_init(ag);
        if (ret)
                goto err;
 
        int ret;
 
        ret = ag71xx_rings_init(ag);
        if (ret)
                goto err;
 

+       if (pdata->is_ar724x)
+               ag71xx_hw_init(ag);
+

        napi_enable(&ag->napi);
 
        netif_carrier_off(dev);
        napi_enable(&ag->napi);
 
        netif_carrier_off(dev);


@@ -474,15 +609,15 @@ static int ag71xx_stop(struct net_device *dev)
        struct ag71xx *ag = netdev_priv(dev);
        unsigned long flags;
 
        struct ag71xx *ag = netdev_priv(dev);
        unsigned long flags;
 

+       netif_carrier_off(dev);
+       ag71xx_phy_stop(ag);
+

        spin_lock_irqsave(&ag->lock, flags);
 
        netif_stop_queue(dev);
 
        ag71xx_hw_stop(ag);
 
        spin_lock_irqsave(&ag->lock, flags);
 
        netif_stop_queue(dev);
 
        ag71xx_hw_stop(ag);
 

-       netif_carrier_off(dev);
-       ag71xx_phy_stop(ag);
-

        napi_disable(&ag->napi);
        del_timer_sync(&ag->oom_timer);
 
        napi_disable(&ag->napi);
        del_timer_sync(&ag->oom_timer);
 


@@ -508,14 +643,16 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
        if (!ag71xx_desc_empty(desc))
                goto err_drop;
 
        if (!ag71xx_desc_empty(desc))
                goto err_drop;
 

-       ag71xx_add_ar8216_header(ag, skb);
+       if (ag71xx_has_ar8216(ag))
+               ag71xx_add_ar8216_header(ag, skb);

 
        if (skb->len <= 0) {
                DBG("%s: packet len is too small\n", ag->dev->name);
                goto err_drop;
        }
 
 
        if (skb->len <= 0) {
                DBG("%s: packet len is too small\n", ag->dev->name);
                goto err_drop;
        }
 

-       dma_addr = dma_map_single(NULL, skb->data, skb->len, DMA_TO_DEVICE);
+       dma_addr = dma_map_single(&dev->dev, skb->data, skb->len,
+                                 DMA_TO_DEVICE);

 
        ring->buf[i].skb = skb;
 
 
        ring->buf[i].skb = skb;
 


@@ -537,8 +674,6 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
        /* enable TX engine */
        ag71xx_wr(ag, AG71XX_REG_TX_CTRL, TX_CTRL_TXE);
 
        /* enable TX engine */
        ag71xx_wr(ag, AG71XX_REG_TX_CTRL, TX_CTRL_TXE);
 

-       dev->trans_start = jiffies;
-

        return NETDEV_TX_OK;
 
  err_drop:
        return NETDEV_TX_OK;
 
  err_drop:


@@ -550,7 +685,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;
 


@@ -582,7 +716,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;


@@ -667,6 +801,7 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
                struct ag71xx_desc *desc = ring->buf[i].desc;
                struct sk_buff *skb;
                int pktlen;
                struct ag71xx_desc *desc = ring->buf[i].desc;
                struct sk_buff *skb;
                int pktlen;

+               int err = 0;

 
                if (ag71xx_desc_empty(desc))
                        break;
 
                if (ag71xx_desc_empty(desc))
                        break;


@@ -682,21 +817,29 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
                pktlen = ag71xx_desc_pktlen(desc);
                pktlen -= ETH_FCS_LEN;
 
                pktlen = ag71xx_desc_pktlen(desc);
                pktlen -= ETH_FCS_LEN;
 

-               skb_put(skb, pktlen);
-
-               skb->dev = dev;
-               skb->ip_summed = CHECKSUM_NONE;
+               dma_unmap_single(&dev->dev, ring->buf[i].dma_addr,
+                                AG71XX_RX_PKT_SIZE, DMA_FROM_DEVICE);

 
                dev->last_rx = jiffies;
                dev->stats.rx_packets++;
                dev->stats.rx_bytes += pktlen;
 
 
                dev->last_rx = jiffies;
                dev->stats.rx_packets++;
                dev->stats.rx_bytes += pktlen;
 

-               if (ag71xx_remove_ar8216_header(ag, skb) != 0) {
+               skb_put(skb, pktlen);
+               if (ag71xx_has_ar8216(ag))
+                       err = ag71xx_remove_ar8216_header(ag, skb, pktlen);
+
+               if (err) {

                        dev->stats.rx_dropped++;
                        kfree_skb(skb);
                } else {
                        dev->stats.rx_dropped++;
                        kfree_skb(skb);
                } else {

-                       skb->protocol = eth_type_trans(skb, dev);
-                       netif_receive_skb(skb);
+                       skb->dev = dev;
+                       skb->ip_summed = CHECKSUM_NONE;
+                       if (ag->phy_dev) {
+                               ag->phy_dev->netif_receive_skb(skb);
+                       } else {
+                               skb->protocol = eth_type_trans(skb, dev);
+                               netif_receive_skb(skb);
+                       }

                }
 
                ring->buf[i].skb = NULL;
                }
 
                ring->buf[i].skb = NULL;


@@ -818,6 +961,20 @@ static void ag71xx_set_multicast_list(struct net_device *dev)
        /* TODO */
 }
 
        /* TODO */
 }
 

+#ifdef CONFIG_NET_POLL_CONTROLLER
+/*
+ * Polling 'interrupt' - used by things like netconsole to send skbs
+ * without having to re-enable interrupts. It's not called while
+ * the interrupt routine is executing.
+ */
+static void ag71xx_netpoll(struct net_device *dev)
+{
+       disable_irq(dev->irq);
+       ag71xx_interrupt(dev->irq, dev);
+       enable_irq(dev->irq);
+}
+#endif
+

 static const struct net_device_ops ag71xx_netdev_ops = {
        .ndo_open               = ag71xx_open,
        .ndo_stop               = ag71xx_stop,
 static const struct net_device_ops ag71xx_netdev_ops = {
        .ndo_open               = ag71xx_open,
        .ndo_stop               = ag71xx_stop,


@@ -828,6 +985,9 @@ static const struct net_device_ops ag71xx_netdev_ops = {
        .ndo_change_mtu         = eth_change_mtu,
        .ndo_set_mac_address    = eth_mac_addr,
        .ndo_validate_addr      = eth_validate_addr,
        .ndo_change_mtu         = eth_change_mtu,
        .ndo_set_mac_address    = eth_mac_addr,
        .ndo_validate_addr      = eth_validate_addr,

+#ifdef CONFIG_NET_POLL_CONTROLLER
+       .ndo_poll_controller    = ag71xx_netpoll,
+#endif

 };
 
 static int __init ag71xx_probe(struct platform_device *pdev)
 };
 
 static int __init ag71xx_probe(struct platform_device *pdev)