net: macb: Separate rx and tx ring init function

PATCH Superseded Neil Armstrong 2 participants 4 messages Jul 18, 2014

Subsystems (3)

Networking Network drivers Atmel MACB Ethernet driver

lore

Share & tools

lore

Neil Armstrong

author

2014-07-18 09:52 UTC #0 lore raw

PATCH 1/2 net: macb: Separate rx and tx ring init function

A single method is called to initialize the TX and RX rings. Separate the methods into distinct ones for MACB and GEM context.

Signed-off-by Neil Armstrong <[email protected]>

---
 drivers/net/ethernet/cadence/macb.c |   33 ++++++++++++++++++++++++---------
 drivers/net/ethernet/cadence/macb.h |    3 ++-
 2 files changed, 26 insertions(+), 10 deletions(-)

drivers/net/ethernet/cadence/macb.c +24 -9

index e9daa07..20ad483 100644
@@ -1219,7 +1219,14 @@ out_err:
 	return -ENOMEM;
 }
 
-static void gem_init_rings(struct macb *bp)
+static void gem_init_rx_rings(struct macb *bp)
+{
+	bp->rx_tail = bp->rx_prepared_head = 0;
+
+	gem_rx_refill(bp);
+}
+
+static void gem_init_tx_rings(struct macb *bp)
 {
 	int i;

@@ -1229,12 +1236,10 @@ static void gem_init_rings(struct macb *bp)
 	}
 	bp->tx_ring[TX_RING_SIZE - 1].ctrl |= MACB_BIT(TX_WRAP);
 
-	bp->rx_tail = bp->rx_prepared_head = bp->tx_head = bp->tx_tail = 0;
-
-	gem_rx_refill(bp);
+	bp->tx_head = bp->tx_tail = 0;
 }
 
-static void macb_init_rings(struct macb *bp)
+static void macb_init_rx_rings(struct macb *bp)
 {
 	int i;
 	dma_addr_t addr;

@@ -1247,13 +1252,20 @@ static void macb_init_rings(struct macb *bp)
 	}
 	bp->rx_ring[RX_RING_SIZE - 1].addr |= MACB_BIT(RX_WRAP);
 
+	bp->rx_tail = 0;
+}
+
+static void macb_init_tx_rings(struct macb *bp)
+{
+	int i;
+
 	for (i = 0; i < TX_RING_SIZE; i++) {
 		bp->tx_ring[i].addr = 0;
 		bp->tx_ring[i].ctrl = MACB_BIT(TX_USED);
 	}
 	bp->tx_ring[TX_RING_SIZE - 1].ctrl |= MACB_BIT(TX_WRAP);
 
-	bp->rx_tail = bp->tx_head = bp->tx_tail = 0;
+	bp->tx_head = bp->tx_tail = 0;
 }
 
 static void macb_reset_hw(struct macb *bp)

@@ -1554,7 +1566,8 @@ static int macb_open(struct net_device *dev)
 
 	napi_enable(&bp->napi);
 
-	bp->macbgem_ops.mog_init_rings(bp);
+	bp->macbgem_ops.mog_init_rx_rings(bp);
+	bp->macbgem_ops.mog_init_tx_rings(bp);
 	macb_init_hw(bp);
 
 	/* schedule a link state check */

@@ -1901,12 +1914,14 @@ static int __init macb_probe(struct platform_device *pdev)
 	if (macb_is_gem(bp)) {
 		bp->macbgem_ops.mog_alloc_rx_buffers = gem_alloc_rx_buffers;
 		bp->macbgem_ops.mog_free_rx_buffers = gem_free_rx_buffers;
-		bp->macbgem_ops.mog_init_rings = gem_init_rings;
+		bp->macbgem_ops.mog_init_rx_rings = gem_init_rx_rings;
+		bp->macbgem_ops.mog_init_tx_rings = gem_init_tx_rings;
 		bp->macbgem_ops.mog_rx = gem_rx;
 	} else {
 		bp->macbgem_ops.mog_alloc_rx_buffers = macb_alloc_rx_buffers;
 		bp->macbgem_ops.mog_free_rx_buffers = macb_free_rx_buffers;
-		bp->macbgem_ops.mog_init_rings = macb_init_rings;
+		bp->macbgem_ops.mog_init_rx_rings = macb_init_rx_rings;
+		bp->macbgem_ops.mog_init_tx_rings = macb_init_tx_rings;
 		bp->macbgem_ops.mog_rx = macb_rx;
 	}

drivers/net/ethernet/cadence/macb.h +2 -1

index 51c0244..8016d08 100644
@@ -550,7 +550,8 @@ struct macb;
 struct macb_or_gem_ops {
 	int	(*mog_alloc_rx_buffers)(struct macb *bp);
 	void	(*mog_free_rx_buffers)(struct macb *bp);
-	void	(*mog_init_rings)(struct macb *bp);
+	void	(*mog_init_rx_rings)(struct macb *bp);
+	void	(*mog_init_tx_rings)(struct macb *bp);
 	int	(*mog_rx)(struct macb *bp, int budget);
 };

Signature · 1 line

1.7.0.4

Varka Bhadram

2014-07-18 10:10 UTC #1 lore raw

Quoted 31 lines · Neil Armstrong

A single method is called to initialize the TX and RX rings. Separate the methods into distinct ones for MACB and GEM context.

Signed-off-by Neil Armstrong <[email protected]>

---
  drivers/net/ethernet/cadence/macb.c |   33 ++++++++++++++++++++++++---------
  drivers/net/ethernet/cadence/macb.h |    3 ++-
  2 files changed, 26 insertions(+), 10 deletions(-)

drivers/net/ethernet/cadence/macb.c +8 -1

index e9daa07..20ad483 100644
@@ -1219,7 +1219,14 @@ out_err:
  	return -ENOMEM;
  }
 
-static void gem_init_rings(struct macb *bp)
+static void gem_init_rx_rings(struct macb *bp)
+{
+	bp->rx_tail = bp->rx_prepared_head = 0;
+
+	gem_rx_refill(bp);
+}
+
+static void gem_init_tx_rings(struct macb *bp)
  {
  	int i;

drivers/net/ethernet/cadence/macb.c static void gem_init_rings(struct macb *bp) · line 1239

Quoted 7 lines

drivers/net/ethernet/cadence/macb.c +1 -3

@@ -1229,12 +1236,10 @@ static void gem_init_rings(struct macb *bp)
  	}
  	bp->tx_ring[TX_RING_SIZE - 1].ctrl |= MACB_BIT(TX_WRAP);
 
-	bp->rx_tail = bp->rx_prepared_head = bp->tx_head = bp->tx_tail = 0;
-
-	gem_rx_refill(bp);
+	bp->tx_head = bp->tx_tail = 0;

This is not the preferred way of doing it....

multiple assignments should be avoided

Quoted 16 lines

drivers/net/ethernet/cadence/macb.c +6 -1

  }
 
-static void macb_init_rings(struct macb *bp)
+static void macb_init_rx_rings(struct macb *bp)
  {
  	int i;
  	dma_addr_t addr;

@@ -1247,13 +1252,20 @@ static void macb_init_rings(struct macb *bp)
  	}
  	bp->rx_ring[RX_RING_SIZE - 1].addr |= MACB_BIT(RX_WRAP);
 
+	bp->rx_tail = 0;
+}
+
+static void macb_init_tx_rings(struct macb *bp)
+{

drivers/net/ethernet/cadence/macb.c static void macb_init_rings(struct macb *bp) · line 1268

Quoted 10 lines

drivers/net/ethernet/cadence/macb.c +3 -1

+	int i;
+
  	for (i = 0; i < TX_RING_SIZE; i++) {
  		bp->tx_ring[i].addr = 0;
  		bp->tx_ring[i].ctrl = MACB_BIT(TX_USED);
  	}
  	bp->tx_ring[TX_RING_SIZE - 1].ctrl |= MACB_BIT(TX_WRAP);
 
-	bp->rx_tail = bp->tx_head = bp->tx_tail = 0;
+	bp->tx_head = bp->tx_tail = 0;

Dto...

Quoted 44 lines

drivers/net/ethernet/cadence/macb.c +6 -3

  }
 
  static void macb_reset_hw(struct macb *bp)

@@ -1554,7 +1566,8 @@ static int macb_open(struct net_device *dev)
 
  	napi_enable(&bp->napi);
 
-	bp->macbgem_ops.mog_init_rings(bp);
+	bp->macbgem_ops.mog_init_rx_rings(bp);
+	bp->macbgem_ops.mog_init_tx_rings(bp);
  	macb_init_hw(bp);
 
  	/* schedule a link state check */

@@ -1901,12 +1914,14 @@ static int __init macb_probe(struct platform_device *pdev)
  	if (macb_is_gem(bp)) {
  		bp->macbgem_ops.mog_alloc_rx_buffers = gem_alloc_rx_buffers;
  		bp->macbgem_ops.mog_free_rx_buffers = gem_free_rx_buffers;
-		bp->macbgem_ops.mog_init_rings = gem_init_rings;
+		bp->macbgem_ops.mog_init_rx_rings = gem_init_rx_rings;
+		bp->macbgem_ops.mog_init_tx_rings = gem_init_tx_rings;
  		bp->macbgem_ops.mog_rx = gem_rx;
  	} else {
  		bp->macbgem_ops.mog_alloc_rx_buffers = macb_alloc_rx_buffers;
  		bp->macbgem_ops.mog_free_rx_buffers = macb_free_rx_buffers;
-		bp->macbgem_ops.mog_init_rings = macb_init_rings;
+		bp->macbgem_ops.mog_init_rx_rings = macb_init_rx_rings;
+		bp->macbgem_ops.mog_init_tx_rings = macb_init_tx_rings;
  		bp->macbgem_ops.mog_rx = macb_rx;
  	}

drivers/net/ethernet/cadence/macb.h +2 -1

index 51c0244..8016d08 100644
@@ -550,7 +550,8 @@ struct macb;
  struct macb_or_gem_ops {
  	int	(*mog_alloc_rx_buffers)(struct macb *bp);
  	void	(*mog_free_rx_buffers)(struct macb *bp);
-	void	(*mog_init_rings)(struct macb *bp);
+	void	(*mog_init_rx_rings)(struct macb *bp);
+	void	(*mog_init_tx_rings)(struct macb *bp);
  	int	(*mog_rx)(struct macb *bp, int budget);
  };

Signature · 2 lines

Regards,
Varka Bhadram.

Neil Armstrong

author

2014-07-18 10:13 UTC #2 lore raw

Quoted 35 lines · Varka Bhadram

Quoted 34 lines · Neil Armstrong

A single method is called to initialize the TX and RX rings. Separate the methods into distinct ones for MACB and GEM context.

Signed-off-by Neil Armstrong <[email protected]>

---
  drivers/net/ethernet/cadence/macb.c |   33 ++++++++++++++++++++++++---------
  drivers/net/ethernet/cadence/macb.h |    3 ++-
  2 files changed, 26 insertions(+), 10 deletions(-)

drivers/net/ethernet/cadence/macb.c +8 -1

index e9daa07..20ad483 100644
@@ -1219,7 +1219,14 @@ out_err:
  	return -ENOMEM;
  }
 
-static void gem_init_rings(struct macb *bp)
+static void gem_init_rx_rings(struct macb *bp)
+{
+	bp->rx_tail = bp->rx_prepared_head = 0;
+
+	gem_rx_refill(bp);
+}
+
+static void gem_init_tx_rings(struct macb *bp)
  {
  	int i;

@@ -1229,12 +1236,10 @@ static void gem_init_rings(struct macb *bp)
  	}
  	bp->tx_ring[TX_RING_SIZE - 1].ctrl |= MACB_BIT(TX_WRAP);

Quoted 8 lines

drivers/net/ethernet/cadence/macb.c static void gem_init_rings(struct macb *bp) · line 1239
Quoted 4 lines
drivers/net/ethernet/cadence/macb.c +1 -3
-	bp->rx_tail = bp->rx_prepared_head = bp->tx_head = bp->tx_tail = 0;
-
-	gem_rx_refill(bp);
+	bp->tx_head = bp->tx_tail = 0;
This is not the preferred way of doing it....
multiple assignments should be avoided

Should I change it ? I only moved the lines, the logic hasn't changed.

Quoted 25 lines

drivers/net/ethernet/cadence/macb.c +8 -1

  }
 
-static void macb_init_rings(struct macb *bp)
+static void macb_init_rx_rings(struct macb *bp)
  {
  	int i;
  	dma_addr_t addr;

@@ -1247,13 +1252,20 @@ static void macb_init_rings(struct macb *bp)
  	}
  	bp->rx_ring[RX_RING_SIZE - 1].addr |= MACB_BIT(RX_WRAP);
 
+	bp->rx_tail = 0;
+}
+
+static void macb_init_tx_rings(struct macb *bp)
+{
+	int i;
+
  	for (i = 0; i < TX_RING_SIZE; i++) {
  		bp->tx_ring[i].addr = 0;
  		bp->tx_ring[i].ctrl = MACB_BIT(TX_USED);
  	}
  	bp->tx_ring[TX_RING_SIZE - 1].ctrl |= MACB_BIT(TX_WRAP);

Quoted 4 lines

drivers/net/ethernet/cadence/macb.c static void macb_init_rings(struct macb *bp) · line 1268
Quoted 2 lines
drivers/net/ethernet/cadence/macb.c +1 -1
-	bp->rx_tail = bp->tx_head = bp->tx_tail = 0;
+	bp->tx_head = bp->tx_tail = 0;
Dto...

Idem, it was like this before.

Quoted 31 lines

drivers/net/ethernet/cadence/macb.c +6 -3

  }
 
  static void macb_reset_hw(struct macb *bp)

@@ -1554,7 +1566,8 @@ static int macb_open(struct net_device *dev)
 
  	napi_enable(&bp->napi);
 
-	bp->macbgem_ops.mog_init_rings(bp);
+	bp->macbgem_ops.mog_init_rx_rings(bp);
+	bp->macbgem_ops.mog_init_tx_rings(bp);
  	macb_init_hw(bp);
 
  	/* schedule a link state check */

@@ -1901,12 +1914,14 @@ static int __init macb_probe(struct platform_device *pdev)
  	if (macb_is_gem(bp)) {
  		bp->macbgem_ops.mog_alloc_rx_buffers = gem_alloc_rx_buffers;
  		bp->macbgem_ops.mog_free_rx_buffers = gem_free_rx_buffers;
-		bp->macbgem_ops.mog_init_rings = gem_init_rings;
+		bp->macbgem_ops.mog_init_rx_rings = gem_init_rx_rings;
+		bp->macbgem_ops.mog_init_tx_rings = gem_init_tx_rings;
  		bp->macbgem_ops.mog_rx = gem_rx;
  	} else {
  		bp->macbgem_ops.mog_alloc_rx_buffers = macb_alloc_rx_buffers;
  		bp->macbgem_ops.mog_free_rx_buffers = macb_free_rx_buffers;
-		bp->macbgem_ops.mog_init_rings = macb_init_rings;
+		bp->macbgem_ops.mog_init_rx_rings = macb_init_rx_rings;
+		bp->macbgem_ops.mog_init_tx_rings = macb_init_tx_rings;
  		bp->macbgem_ops.mog_rx = macb_rx;
  	}

Quoted 16 lines

Quoted 5 lines

drivers/net/ethernet/cadence/macb.h +0 -0
index 51c0244..8016d08 100644

drivers/net/ethernet/cadence/macb.h struct macb; · line 557

Quoted 9 lines

drivers/net/ethernet/cadence/macb.h +2 -1

@@ -550,7 +550,8 @@ struct macb;
  struct macb_or_gem_ops {
  	int	(*mog_alloc_rx_buffers)(struct macb *bp);
  	void	(*mog_free_rx_buffers)(struct macb *bp);
-	void	(*mog_init_rings)(struct macb *bp);
+	void	(*mog_init_rx_rings)(struct macb *bp);
+	void	(*mog_init_tx_rings)(struct macb *bp);
  	int	(*mog_rx)(struct macb *bp, int budget);
  };

Do I need to make a corrective patch for multiple assignments before ?

Varka Bhadram

2014-07-18 10:15 UTC #3 lore raw

Quoted 36 lines · Neil Armstrong

Quoted 35 lines · Varka Bhadram

Quoted 34 lines · Neil Armstrong

A single method is called to initialize the TX and RX rings. Separate the methods into distinct ones for MACB and GEM context.

Signed-off-by Neil Armstrong <[email protected]>

---
   drivers/net/ethernet/cadence/macb.c |   33 ++++++++++++++++++++++++---------
   drivers/net/ethernet/cadence/macb.h |    3 ++-
   2 files changed, 26 insertions(+), 10 deletions(-)

drivers/net/ethernet/cadence/macb.c +8 -1

index e9daa07..20ad483 100644
@@ -1219,7 +1219,14 @@ out_err:
   	return -ENOMEM;
   }
 
-static void gem_init_rings(struct macb *bp)
+static void gem_init_rx_rings(struct macb *bp)
+{
+	bp->rx_tail = bp->rx_prepared_head = 0;
+
+	gem_rx_refill(bp);
+}
+
+static void gem_init_tx_rings(struct macb *bp)
   {
   	int i;

@@ -1229,12 +1236,10 @@ static void gem_init_rings(struct macb *bp)
   	}
   	bp->tx_ring[TX_RING_SIZE - 1].ctrl |= MACB_BIT(TX_WRAP);

Quoted 9 lines

Quoted 7 lines
drivers/net/ethernet/cadence/macb.c static void gem_init_rings(struct macb *bp) · line 1239
Quoted 4 lines
drivers/net/ethernet/cadence/macb.c +1 -3
-	bp->rx_tail = bp->rx_prepared_head = bp->tx_head = bp->tx_tail = 0;
-
-	gem_rx_refill(bp);
+	bp->tx_head = bp->tx_tail = 0;
This is not the preferred way of doing it....
multiple assignments should be avoided
Should I change it ? I only moved the lines, the logic hasn't changed.

Yes. we can change the logic also.... :-)

Signature · 2 lines

Regards,
Varka Bhadram.