X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b9cdd21fc58819db209be6da19ec8552c15b9d81..0e481cb3bc7ced638fa5885b78205406b84498d0:/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 fd203702b..0ba4d55e8 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -11,6 +11,7 @@
  *  by the Free Software Foundation.
  */
 
+#include <linux/cache.h>
 #include "ag71xx.h"
 
 #define AG71XX_DEFAULT_MSG_ENABLE	\
@@ -23,10 +24,10 @@
 	| NETIF_MSG_RX_ERR		\
 	| NETIF_MSG_TX_ERR )
 
-static int ag71xx_debug = -1;
+static int ag71xx_msg_level = -1;
 
-module_param(ag71xx_debug, int, 0);
-MODULE_PARM_DESC(ag71xx_debug, "Debug level (-1=defaults,0=none,...,16=all)");
+module_param_named(msg_level, ag71xx_msg_level, int, 0);
+MODULE_PARM_DESC(msg_level, "Message level (-1=defaults,0=none,...,16=all)");
 
 static void ag71xx_dump_dma_regs(struct ag71xx *ag)
 {
@@ -85,19 +86,27 @@ 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 * ring->desc_size,
+				  ring->descs_cpu, ring->descs_dma);
 }
 
 static int ag71xx_ring_alloc(struct ag71xx_ring *ring, unsigned int size)
 {
 	int err;
+	int i;
+
+	ring->desc_size = sizeof(struct ag71xx_desc);
+	if (ring->desc_size % cache_line_size()) {
+		DBG("ag71xx: ring %p, desc size %u rounded to %u\n",
+			ring, ring->desc_size,
+			roundup(ring->desc_size, cache_line_size()));
+		ring->desc_size = roundup(ring->desc_size, cache_line_size());
+	}
 
-	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 * ring->desc_size,
+					     &ring->descs_dma, GFP_ATOMIC);
+	if (!ring->descs_cpu) {
 		err = -ENOMEM;
 		goto err;
 	}
@@ -110,6 +119,12 @@ static int ag71xx_ring_alloc(struct ag71xx_ring *ring, unsigned int size)
 		goto err;
 	}
 
+	for (i = 0; i < size; i++) {
+		ring->buf[i].desc = (struct ag71xx_desc *)&ring->descs_cpu[i * ring->desc_size];
+		DBG("ag71xx: ring %p, desc %d at %p\n",
+			ring, i, ring->buf[i].desc);
+	}
+
 	return 0;
 
  err:
@@ -124,8 +139,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 +163,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 +
+			ring->desc_size * ((i + 1) % AG71XX_TX_RING_SIZE));
 
-		ring->descs[i].ctrl = DESC_EMPTY;
+		ring->buf[i].desc->ctrl = DESC_EMPTY;
 		ring->buf[i].skb = NULL;
 	}
 
@@ -183,9 +198,14 @@ static int ag71xx_ring_rx_init(struct ag71xx *ag)
 	int ret;
 
 	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));
+	for (i = 0; i < AG71XX_RX_RING_SIZE; i++) {
+		ring->buf[i].desc->next = (u32) (ring->descs_dma +
+			ring->desc_size * ((i + 1) % AG71XX_RX_RING_SIZE));
+
+		DBG("ag71xx: RX desc at %p, next is %08x\n",
+			ring->buf[i].desc,
+			ring->buf[i].desc->next);
+	}
 
 	for (i = 0; i < AG71XX_RX_RING_SIZE; i++) {
 		struct sk_buff *skb;
@@ -203,8 +223,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 +261,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++;
 	}
 
@@ -457,22 +477,18 @@ static int ag71xx_stop(struct net_device *dev)
 static int ag71xx_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct ag71xx *ag = netdev_priv(dev);
-	struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
 	struct ag71xx_ring *ring = &ag->tx_ring;
 	struct ag71xx_desc *desc;
-	unsigned long flags;
 	int i;
 
 	i = ring->curr % AG71XX_TX_RING_SIZE;
-	desc = &ring->descs[i];
-
-	spin_lock_irqsave(&ag->lock, flags);
-	pdata->ddr_flush();
-	spin_unlock_irqrestore(&ag->lock, flags);
+	desc = ring->buf[i].desc;
 
 	if (!ag71xx_desc_empty(desc))
 		goto err_drop;
 
+	ag71xx_add_ar8216_header(ag, skb);
+
 	if (skb->len <= 0) {
 		DBG("%s: packet len is too small\n", ag->dev->name);
 		goto err_drop;
@@ -590,7 +606,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))
@@ -626,7 +642,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;
 
@@ -647,15 +663,20 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
 		skb_put(skb, pktlen);
 
 		skb->dev = dev;
-		skb->protocol = eth_type_trans(skb, dev);
 		skb->ip_summed = CHECKSUM_NONE;
 
-		netif_receive_skb(skb);
-
 		dev->last_rx = jiffies;
 		dev->stats.rx_packets++;
 		dev->stats.rx_bytes += pktlen;
 
+		if (ag71xx_remove_ar8216_header(ag, skb) != 0) {
+			dev->stats.rx_dropped++;
+			kfree_skb(skb);
+		} else {
+			skb->protocol = eth_type_trans(skb, dev);
+			netif_receive_skb(skb);
+		}
+
 		ring->buf[i].skb = NULL;
 		done++;
 
@@ -716,13 +737,13 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
 		spin_lock_irqsave(&ag->lock, flags);
 		ag71xx_int_enable(ag, AG71XX_INT_POLL);
 		spin_unlock_irqrestore(&ag->lock, flags);
-		return 0;
+		return done;
 	}
 
  more:
 	DBG("%s: stay in polling mode, done=%d, limit=%d\n",
 			dev->name, done, limit);
-	return 1;
+	return done;
 
  oom:
 	if (netif_msg_rx_err(ag))
@@ -797,8 +818,8 @@ static int __init ag71xx_probe(struct platform_device *pdev)
 	ag = netdev_priv(dev);
 	ag->pdev = pdev;
 	ag->dev = dev;
-	ag->mii_bus = &ag71xx_mdio_bus->mii_bus;
-	ag->msg_enable = netif_msg_init(ag71xx_debug,
+	ag->mii_bus = ag71xx_mdio_bus->mii_bus;
+	ag->msg_enable = netif_msg_init(ag71xx_msg_level,
 					AG71XX_DEFAULT_MSG_ENABLE);
 	spin_lock_init(&ag->lock);