From 82a084680a527039a3fda555131919cc29a498d7 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Mon, 13 Jul 2009 11:38:37 +0000 Subject: [PATCH] ag71xx driver: store descriptor pointers in ag71xx_buf SVN-Revision: 16824 --- .../ar71xx/files/drivers/net/ag71xx/ag71xx.h | 5 +- .../files/drivers/net/ag71xx/ag71xx_main.c | 49 +++++++++++-------- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h index 843fc4cc9c..ca328e35d7 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h @@ -38,7 +38,7 @@ #define ETH_FCS_LEN 4 #define AG71XX_DRV_NAME "ag71xx" -#define AG71XX_DRV_VERSION "0.5.21" +#define AG71XX_DRV_VERSION "0.5.22" #define AG71XX_NAPI_WEIGHT 64 #define AG71XX_OOM_REFILL (1 + HZ/10) @@ -89,11 +89,12 @@ struct ag71xx_desc { struct ag71xx_buf { struct sk_buff *skb; + struct ag71xx_desc *desc; }; struct ag71xx_ring { struct ag71xx_buf *buf; - struct ag71xx_desc *descs; + struct ag71xx_desc *descs_cpu; dma_addr_t descs_dma; unsigned int curr; unsigned int dirty; 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 9b96f3d14b..6302bf648c 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c @@ -85,19 +85,21 @@ static void ag71xx_ring_free(struct ag71xx_ring *ring) { kfree(ring->buf); - if (ring->descs) - dma_free_coherent(NULL, ring->size * sizeof(*ring->descs), - ring->descs, ring->descs_dma); + if (ring->descs_cpu) + dma_free_coherent(NULL, ring->size * sizeof(struct ag71xx_desc), + ring->descs_cpu, ring->descs_dma); } static int ag71xx_ring_alloc(struct ag71xx_ring *ring, unsigned int size) { int err; + int i; - ring->descs = dma_alloc_coherent(NULL, size * sizeof(*ring->descs), - &ring->descs_dma, - GFP_ATOMIC); - if (!ring->descs) { + ring->descs_cpu = dma_alloc_coherent(NULL, + size * sizeof(struct ag71xx_desc), + &ring->descs_dma, + GFP_ATOMIC); + if (!ring->descs_cpu) { err = -ENOMEM; goto err; } @@ -110,6 +112,11 @@ static int ag71xx_ring_alloc(struct ag71xx_ring *ring, unsigned int size) goto err; } + for (i = 0; i < size; i++) { + struct ag71xx_desc *descs = (struct ag71xx_desc *) ring->descs_cpu; + ring->buf[i].desc = &descs[i]; + } + return 0; err: @@ -124,8 +131,8 @@ static void ag71xx_ring_tx_clean(struct ag71xx *ag) while (ring->curr != ring->dirty) { u32 i = ring->dirty % AG71XX_TX_RING_SIZE; - if (!ag71xx_desc_empty(&ring->descs[i])) { - ring->descs[i].ctrl = 0; + if (!ag71xx_desc_empty(ring->buf[i].desc)) { + ring->buf[i].desc->ctrl = 0; dev->stats.tx_errors++; } @@ -148,10 +155,10 @@ static void ag71xx_ring_tx_init(struct ag71xx *ag) int i; for (i = 0; i < AG71XX_TX_RING_SIZE; i++) { - ring->descs[i].next = (u32) (ring->descs_dma + - sizeof(*ring->descs) * ((i + 1) % AG71XX_TX_RING_SIZE)); + ring->buf[i].desc->next = (u32) (ring->descs_dma + + sizeof(struct ag71xx_desc) * ((i + 1) % AG71XX_TX_RING_SIZE)); - ring->descs[i].ctrl = DESC_EMPTY; + ring->buf[i].desc->ctrl = DESC_EMPTY; ring->buf[i].skb = NULL; } @@ -184,8 +191,8 @@ static int ag71xx_ring_rx_init(struct ag71xx *ag) ret = 0; for (i = 0; i < AG71XX_RX_RING_SIZE; i++) - ring->descs[i].next = (u32) (ring->descs_dma + - sizeof(*ring->descs) * ((i + 1) % AG71XX_RX_RING_SIZE)); + ring->buf[i].desc->next = (u32) (ring->descs_dma + + sizeof(struct ag71xx_desc) * ((i + 1) % AG71XX_RX_RING_SIZE)); for (i = 0; i < AG71XX_RX_RING_SIZE; i++) { struct sk_buff *skb; @@ -203,8 +210,8 @@ static int ag71xx_ring_rx_init(struct ag71xx *ag) skb_reserve(skb, AG71XX_RX_PKT_RESERVE); ring->buf[i].skb = skb; - ring->descs[i].data = virt_to_phys(skb->data); - ring->descs[i].ctrl = DESC_EMPTY; + ring->buf[i].desc->data = virt_to_phys(skb->data); + ring->buf[i].desc->ctrl = DESC_EMPTY; } /* flush descriptors */ @@ -241,10 +248,10 @@ static int ag71xx_ring_rx_refill(struct ag71xx *ag) skb->dev = ag->dev; ring->buf[i].skb = skb; - ring->descs[i].data = virt_to_phys(skb->data); + ring->buf[i].desc->data = virt_to_phys(skb->data); } - ring->descs[i].ctrl = DESC_EMPTY; + ring->buf[i].desc->ctrl = DESC_EMPTY; count++; } @@ -462,7 +469,7 @@ static int ag71xx_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) int i; i = ring->curr % AG71XX_TX_RING_SIZE; - desc = &ring->descs[i]; + desc = ring->buf[i].desc; if (!ag71xx_desc_empty(desc)) goto err_drop; @@ -586,7 +593,7 @@ static void ag71xx_tx_packets(struct ag71xx *ag) sent = 0; while (ring->dirty != ring->curr) { unsigned int i = ring->dirty % AG71XX_TX_RING_SIZE; - struct ag71xx_desc *desc = &ring->descs[i]; + struct ag71xx_desc *desc = ring->buf[i].desc; struct sk_buff *skb = ring->buf[i].skb; if (!ag71xx_desc_empty(desc)) @@ -622,7 +629,7 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit) while (done < limit) { unsigned int i = ring->curr % AG71XX_RX_RING_SIZE; - struct ag71xx_desc *desc = &ring->descs[i]; + struct ag71xx_desc *desc = ring->buf[i].desc; struct sk_buff *skb; int pktlen; -- 2.25.1