Skip to contentSkip to conversation

igb: Wait 10ms just once after TX queues reset

PATCH New Sergey Nemov 2 participants 2 messages May 18, 2018 – May 26, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 igb: Wait 10ms just once after TX queues reset

Move 10ms sleep out of function resetting TX queue. Reset all the TX queues in one turn and wait for all of them just once.

Use usleep_range() instead of mdelay() in order not to affect transmission on other interfaces.

---
 drivers/net/ethernet/intel/igb/igb_main.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/igb/igb_main.c +8 -5
index 715bb32..db05927 100644
@@ -3808,11 +3808,6 @@ void igb_configure_tx_ring(struct igb_adapter *adapter,
 	u64 tdba = ring->dma;
 	int reg_idx = ring->reg_idx;
 
-	/* disable the queue */
-	wr32(E1000_TXDCTL(reg_idx), 0);
-	wrfl();
-	mdelay(10);
-
 	wr32(E1000_TDLEN(reg_idx),
 	     ring->count * sizeof(union e1000_adv_tx_desc));
 	wr32(E1000_TDBAL(reg_idx),
@@ -3843,8 +3838,16 @@ void igb_configure_tx_ring(struct igb_adapter *adapter,
  **/
 static void igb_configure_tx(struct igb_adapter *adapter)
 {
+	struct e1000_hw *hw = &adapter->hw;
 	int i;
 
+	/* disable the queues */
+	for (i = 0; i < adapter->num_tx_queues; i++)
+		wr32(E1000_TXDCTL(adapter->tx_ring[i]->reg_idx), 0);
+
+	wrfl();
+	usleep_range(10000, 20000);
+
 	for (i = 0; i < adapter->num_tx_queues; i++)
 		igb_configure_tx_ring(adapter, adapter->tx_ring[i]);
 }
Signature · 21 lines
1.8.3.1

-------------- next part --------------
From 3b2ac817c6db0e77f44fa38aeac402731a89124d Mon Sep 17 00:00:00 2001
From: Sergey Nemov <[email protected]>
Date: Mon, 23 Apr 2018 14:56:22 +0200
Subject: [PATCH] igb: Wait 10ms just once after TX queues reset
To: [email protected]
Cc: sergey.nemov at intel.com

Move 10ms sleep out of function resetting TX queue.
Reset all the TX queues in one turn and
wait for all of them just once.

Use usleep_range() instead of mdelay() in order not to
affect transmission on other interfaces.

Signed-off-by: Sergey Nemov <[email protected]>
---
 drivers/net/ethernet/intel/igb/igb_main.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/net/ethernet/intel/igb/igb_main.c +8 -5
index 715bb32..db05927 100644
@@ -3808,11 +3808,6 @@ void igb_configure_tx_ring(struct igb_adapter *adapter,
 	u64 tdba = ring->dma;
 	int reg_idx = ring->reg_idx;
 
-	/* disable the queue */
-	wr32(E1000_TXDCTL(reg_idx), 0);
-	wrfl();
-	mdelay(10);
-
 	wr32(E1000_TDLEN(reg_idx),
 	     ring->count * sizeof(union e1000_adv_tx_desc));
 	wr32(E1000_TDBAL(reg_idx),
@@ -3843,8 +3838,16 @@ void igb_configure_tx_ring(struct igb_adapter *adapter,
  **/
 static void igb_configure_tx(struct igb_adapter *adapter)
 {
+	struct e1000_hw *hw = &adapter->hw;
 	int i;
 
+	/* disable the queues */
+	for (i = 0; i < adapter->num_tx_queues; i++)
+		wr32(E1000_TXDCTL(adapter->tx_ring[i]->reg_idx), 0);
+
+	wrfl();
+	usleep_range(10000, 20000);
+
 	for (i = 0; i < adapter->num_tx_queues; i++)
 		igb_configure_tx_ring(adapter, adapter->tx_ring[i]);
 }
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/1 igb: Wait 10ms just once after TX queues reset

Quoted 11 lines

From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Sergey Nemov
Sent: Friday, May 18, 2018 2:59 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH] igb: Wait 10ms just once after TX queues reset

Move 10ms sleep out of function resetting TX queue. Reset all the TX queues in one turn and wait for all of them just once.

Quoted 7 lines

Use usleep_range() instead of mdelay() in order not to affect transmission on other interfaces.

---
 drivers/net/ethernet/intel/igb/igb_main.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)