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 f4c5a12..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
@@ -192,9 +192,28 @@ static void ag71xx_ring_rx_clean(struct ag71xx *ag)
                }
 }
 
                }
 }
 

+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;
 


@@ -212,14 +231,14 @@ 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(&ag->dev->dev, skb->data,
                                          AG71XX_RX_PKT_SIZE,
 
                dma_addr = dma_map_single(&ag->dev->dev, skb->data,
                                          AG71XX_RX_PKT_SIZE,


@@ -242,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;


@@ -254,12 +274,11 @@ 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;
 
                        dma_addr = dma_map_single(&ag->dev->dev, skb->data,
                        skb->dev = ag->dev;
 
                        dma_addr = dma_map_single(&ag->dev->dev, skb->data,


@@ -435,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);


@@ -548,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);


@@ -656,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;
 


@@ -688,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;


@@ -796,19 +824,22 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
                dev->stats.rx_packets++;
                dev->stats.rx_bytes += pktlen;
 
                dev->stats.rx_packets++;
                dev->stats.rx_bytes += pktlen;
 

+               skb_put(skb, pktlen);

                if (ag71xx_has_ar8216(ag))
                if (ag71xx_has_ar8216(ag))

-                       err = ag71xx_remove_ar8216_header(ag, skb);
+                       err = ag71xx_remove_ar8216_header(ag, skb, pktlen);

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

-                       skb_put(skb, pktlen);
-

                        skb->dev = dev;
                        skb->ip_summed = CHECKSUM_NONE;
                        skb->dev = dev;
                        skb->ip_summed = CHECKSUM_NONE;

-                       skb->protocol = eth_type_trans(skb, dev);
-                       netif_receive_skb(skb);
+                       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;