ar71xx: ag71xx remove IRQF_DISABLED

[openwrt/openwrt.git] / target / linux / ar71xx / files / drivers / net / ethernet / atheros / ag71xx / ag71xx_main.c

diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
index c04fb94b94e30b757d877c1b621c513193336665..c7671d9b6b94eef52e6e1344a47f2172a27038fc 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
@@ -100,7 +100,6 @@ static void ag71xx_ring_free(struct ag71xx_ring *ring)
 static int ag71xx_ring_alloc(struct ag71xx_ring *ring)
 {
        int err;
-       int i;
 
        ring->desc_size = sizeof(struct ag71xx_desc);
        if (ring->desc_size % cache_line_size()) {
@@ -124,13 +123,6 @@ static int ag71xx_ring_alloc(struct ag71xx_ring *ring)
                goto err;
        }
 
-       for (i = 0; i < ring->size; i++) {
-               int idx = i * ring->desc_size;
-               ring->buf[i].desc = (struct ag71xx_desc *)&ring->descs_cpu[idx];
-               DBG("ag71xx: ring %p, desc %d at %p\n",
-                       ring, i, ring->buf[i].desc);
-       }
-
        return 0;
 
 err:
@@ -144,10 +136,12 @@ static void ag71xx_ring_tx_clean(struct ag71xx *ag)
        u32 bytes_compl = 0, pkts_compl = 0;
 
        while (ring->curr != ring->dirty) {
+               struct ag71xx_desc *desc;
                u32 i = ring->dirty % ring->size;
 
-               if (!ag71xx_desc_empty(ring->buf[i].desc)) {
-                       ring->buf[i].desc->ctrl = 0;
+               desc = ag71xx_ring_desc(ring, i);
+               if (!ag71xx_desc_empty(desc)) {
+                       desc->ctrl = 0;
                        dev->stats.tx_errors++;
                }
 
@@ -172,10 +166,12 @@ static void ag71xx_ring_tx_init(struct ag71xx *ag)
        int i;
 
        for (i = 0; i < ring->size; i++) {
-               ring->buf[i].desc->next = (u32) (ring->descs_dma +
+               struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i);
+
+               desc->next = (u32) (ring->descs_dma +
                        ring->desc_size * ((i + 1) % ring->size));
 
-               ring->buf[i].desc->ctrl = DESC_EMPTY;
+               desc->ctrl = DESC_EMPTY;
                ring->buf[i].skb = NULL;
        }
 
@@ -222,6 +218,8 @@ static int ag71xx_buffer_offset(struct ag71xx *ag)
 static bool ag71xx_fill_rx_buf(struct ag71xx *ag, struct ag71xx_buf *buf,
                               int offset)
 {
+       struct ag71xx_ring *ring = &ag->rx_ring;
+       struct ag71xx_desc *desc = ag71xx_ring_desc(ring, buf - &ring->buf[0]);
        void *data;
 
        data = kmalloc(ag->rx_buf_size +
@@ -233,7 +231,7 @@ static bool ag71xx_fill_rx_buf(struct ag71xx *ag, struct ag71xx_buf *buf,
        buf->rx_buf = data;
        buf->dma_addr = dma_map_single(&ag->dev->dev, data, ag->rx_buf_size,
                                       DMA_FROM_DEVICE);
-       buf->desc->data = (u32) buf->dma_addr + offset;
+       desc->data = (u32) buf->dma_addr + offset;
        return true;
 }
 
@@ -246,21 +244,24 @@ static int ag71xx_ring_rx_init(struct ag71xx *ag)
 
        ret = 0;
        for (i = 0; i < ring->size; i++) {
-               ring->buf[i].desc->next = (u32) (ring->descs_dma +
+               struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i);
+
+               desc->next = (u32) (ring->descs_dma +
                        ring->desc_size * ((i + 1) % ring->size));
 
                DBG("ag71xx: RX desc at %p, next is %08x\n",
-                       ring->buf[i].desc,
-                       ring->buf[i].desc->next);
+                       desc, desc->next);
        }
 
        for (i = 0; i < ring->size; i++) {
+               struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i);
+
                if (!ag71xx_fill_rx_buf(ag, &ring->buf[i], offset)) {
                        ret = -ENOMEM;
                        break;
                }
 
-               ring->buf[i].desc->ctrl = DESC_EMPTY;
+               desc->ctrl = DESC_EMPTY;
        }
 
        /* flush descriptors */
@@ -280,15 +281,17 @@ static int ag71xx_ring_rx_refill(struct ag71xx *ag)
 
        count = 0;
        for (; ring->curr - ring->dirty > 0; ring->dirty++) {
+               struct ag71xx_desc *desc;
                unsigned int i;
 
                i = ring->dirty % ring->size;
+               desc = ag71xx_ring_desc(ring, i);
 
                if (!ring->buf[i].rx_buf &&
                    !ag71xx_fill_rx_buf(ag, &ring->buf[i], offset))
                        break;
 
-               ring->buf[i].desc->ctrl = DESC_EMPTY;
+               desc->ctrl = DESC_EMPTY;
                count++;
        }
 
@@ -470,18 +473,18 @@ static void ag71xx_hw_init(struct ag71xx *ag)
                reset_mask &= ~(AR71XX_RESET_GE0_PHY | AR71XX_RESET_GE1_PHY);
 
                ath79_device_reset_set(reset_phy);
-               mdelay(50);
+               msleep(50);
                ath79_device_reset_clear(reset_phy);
-               mdelay(200);
+               msleep(200);
        }
 
        ag71xx_sb(ag, AG71XX_REG_MAC_CFG1, MAC_CFG1_SR);
        udelay(20);
 
        ath79_device_reset_set(reset_mask);
-       mdelay(100);
+       msleep(100);
        ath79_device_reset_clear(reset_mask);
-       mdelay(200);
+       msleep(200);
 
        ag71xx_hw_setup(ag);
 
@@ -697,7 +700,7 @@ static int ag71xx_fill_dma_desc(struct ag71xx_ring *ring, u32 addr, int len)
                unsigned int cur_len = len;
 
                i = (ring->curr + ndesc) % ring->size;
-               desc = ring->buf[i].desc;
+               desc = ag71xx_ring_desc(ring, i);
 
                if (!ag71xx_desc_empty(desc))
                        return -1;
@@ -752,7 +755,7 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
                                  DMA_TO_DEVICE);
 
        i = ring->curr % ring->size;
-       desc = ring->buf[i].desc;
+       desc = ag71xx_ring_desc(ring, i);
 
        /* setup descriptor fields */
        n = ag71xx_fill_dma_desc(ring, (u32) dma_addr, skb->len & ag->desc_pktlen_mask);
@@ -901,12 +904,13 @@ static int ag71xx_tx_packets(struct ag71xx *ag)
        struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
        int sent = 0;
        int bytes_compl = 0;
+       int n = 0;
 
        DBG("%s: processing TX ring\n", ag->dev->name);
 
-       while (ring->dirty != ring->curr) {
-               unsigned int i = ring->dirty % ring->size;
-               struct ag71xx_desc *desc = ring->buf[i].desc;
+       while (ring->dirty + n != ring->curr) {
+               unsigned int i = (ring->dirty + n) % ring->size;
+               struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i);
                struct sk_buff *skb = ring->buf[i].skb;
 
                if (!ag71xx_desc_empty(desc)) {
@@ -916,17 +920,22 @@ static int ag71xx_tx_packets(struct ag71xx *ag)
                        break;
                }
 
-               ag71xx_wr(ag, AG71XX_REG_TX_STATUS, TX_STATUS_PS);
+               n++;
+               if (!skb)
+                       continue;
 
-               if (skb) {
-                       dev_kfree_skb_any(skb);
-                       ring->buf[i].skb = NULL;
+               dev_kfree_skb_any(skb);
+               ring->buf[i].skb = NULL;
 
-                       bytes_compl += ring->buf[i].len;
-                       sent++;
-               }
+               bytes_compl += ring->buf[i].len;
 
-               ring->dirty++;
+               sent++;
+               ring->dirty += n;
+
+               while (n > 0) {
+                       ag71xx_wr(ag, AG71XX_REG_TX_STATUS, TX_STATUS_PS);
+                       n--;
+               }
        }
 
        DBG("%s: %d packets sent out\n", ag->dev->name, sent);
@@ -957,7 +966,7 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
 
        while (done < limit) {
                unsigned int i = ring->curr % ring->size;
-               struct ag71xx_desc *desc = ring->buf[i].desc;
+               struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i);
                struct sk_buff *skb;
                int pktlen;
                int err = 0;
@@ -1073,7 +1082,7 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
 more:
        DBG("%s: stay in polling mode, rx=%d, tx=%d, limit=%d\n",
                        dev->name, rx_done, tx_done, limit);
-       return rx_done;
+       return limit;
 
 oom:
        if (netif_msg_rx_err(ag))
@@ -1239,7 +1248,7 @@ static int ag71xx_probe(struct platform_device *pdev)
 
        dev->irq = platform_get_irq(pdev, 0);
        err = request_irq(dev->irq, ag71xx_interrupt,
-                         IRQF_DISABLED,
+                         0x0,
                          dev->name, dev);
        if (err) {
                dev_err(&pdev->dev, "unable to request IRQ %d\n", dev->irq);
@@ -1262,12 +1271,10 @@ static int ag71xx_probe(struct platform_device *pdev)
        ag->max_frame_len = pdata->max_frame_len;
        ag->desc_pktlen_mask = pdata->desc_pktlen_mask;
 
-#ifdef notyet
        if (!pdata->is_ar724x && !pdata->is_ar91xx) {
                ag->tx_ring.desc_split = AG71XX_TX_RING_SPLIT;
                ag->tx_ring.size *= AG71XX_TX_RING_DS_PER_PKT;
        }
-#endif
 
        ag->stop_desc = dma_alloc_coherent(NULL,
                sizeof(struct ag71xx_desc), &ag->stop_desc_dma, GFP_KERNEL);