ar71xx: fix up alignment 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 3644b2d..a3b5f95 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;
+       unsigned int reserve = ag71xx_rx_reserve(ag);
        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;
 
-               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;
-               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,
@@ -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;
+       unsigned int reserve = ag71xx_rx_reserve(ag);
        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;
 
-                       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;
 
-                       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,
@@ -415,12 +434,12 @@ 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);
 
-       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);
 }
 
@@ -580,15 +599,15 @@ static int ag71xx_stop(struct net_device *dev)
        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);
 
-       netif_carrier_off(dev);
-       ag71xx_phy_stop(ag);
-
        napi_disable(&ag->napi);
        del_timer_sync(&ag->oom_timer);
 
@@ -614,7 +633,8 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
        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);
@@ -758,6 +778,28 @@ static int ag71xx_tx_packets(struct ag71xx *ag)
        return sent;
 }
 
+static void ag71xx_rx_align_skb(struct ag71xx *ag, struct sk_buff *skb, int len)
+{
+       int offset = ((unsigned long) skb->data) % 4;
+       void *data;
+
+       if (offset == 2)
+               return;
+
+       if (ag->phy_dev && ag->phy_dev->pkt_align != 0)
+               return;
+
+       if (len > 128)
+               return;
+
+       if (WARN_ON(skb_headroom(skb) < 2))
+               return;
+
+       data = skb->data;
+       skb->data -= 2;
+       memmove(skb->data, data, len);
+}
+
 static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
 {
        struct net_device *dev = ag->dev;
@@ -772,6 +814,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;
+               int err = 0;
 
                if (ag71xx_desc_empty(desc))
                        break;
@@ -790,21 +833,28 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
                dma_unmap_single(&dev->dev, ring->buf[i].dma_addr,
                                 AG71XX_RX_PKT_SIZE, DMA_FROM_DEVICE);
 
-               skb_put(skb, pktlen);
-
-               skb->dev = dev;
-               skb->ip_summed = CHECKSUM_NONE;
-
                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);
+
+               ag71xx_rx_align_skb(ag, skb, pktlen);
+
+               if (err) {
                        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;
@@ -926,6 +976,20 @@ static void ag71xx_set_multicast_list(struct net_device *dev)
        /* 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,
@@ -936,6 +1000,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,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       .ndo_poll_controller    = ag71xx_netpoll,
+#endif
 };
 
 static int __init ag71xx_probe(struct platform_device *pdev)