Skip to contentSkip to conversation

net/e1000: fix the invalid flow control mode setting

PATCH Applied Wenjun Wu 3 participants 3 messages Jan 20, 2021 Network drivers

lore
Share & tools
lore

Wenjun Wu

author
#0 lore raw

PATCH 1/1 net/e1000: fix the invalid flow control mode setting

E1000_CTRL register should be updated according to fc_conf->mode's value.

Fixes af75078fece3 ("first public release")
---
 drivers/net/e1000/igb_ethdev.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
drivers/net/e1000/igb_ethdev.c +34 -0
index 647aa8d99..a8fc57d2c 100644
@@ -3064,6 +3064,7 @@ eth_igb_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
 	uint32_t rx_buf_size;
 	uint32_t max_high_water;
 	uint32_t rctl;
+	uint32_t ctrl;
 
 	hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 	if (fc_conf->autoneg != hw->mac.autoneg)
@@ -3101,6 +3102,39 @@ eth_igb_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
 			rctl &= ~E1000_RCTL_PMCF;
 
 		E1000_WRITE_REG(hw, E1000_RCTL, rctl);
+
+		/*
+		 * check if we want to change flow control mode - driver doesn't have native
+		 * capability to do that, so we'll write the registers ourselves
+		 */
+		ctrl = E1000_READ_REG(hw, E1000_CTRL);
+
+		/*
+		 * set or clear E1000_CTRL_RFCE and E1000_CTRL_TFCE bits depending
+		 * on configuration
+		 */
+		switch (fc_conf->mode) {
+		case RTE_FC_NONE:
+			ctrl &= ~E1000_CTRL_RFCE & ~E1000_CTRL_TFCE;
+			break;
+		case RTE_FC_RX_PAUSE:
+			ctrl |= E1000_CTRL_RFCE;
+			ctrl &= ~E1000_CTRL_TFCE;
+			break;
+		case RTE_FC_TX_PAUSE:
+			ctrl |= E1000_CTRL_TFCE;
+			ctrl &= ~E1000_CTRL_RFCE;
+			break;
+		case RTE_FC_FULL:
+			ctrl |= E1000_CTRL_RFCE | E1000_CTRL_TFCE;
+			break;
+		default:
+			PMD_INIT_LOG(ERR, "invalid flow control mode");
+			return -EINVAL;
+		}
+
+		E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
+
 		E1000_WRITE_FLUSH(hw);
 
 		return 0;
Signature · 1 line
2.25.1
Acked-by on v1 1/1
#1 lore raw
Quoted 76 lines

-----Original Message-----
From: Wu, Wenjun1 <[email protected]>
Sent: Wednesday, January 20, 2021 2:54 PM
To: [email protected]; Guo, Jia <[email protected]>
Cc: Wu, Wenjun1 <[email protected]>; [email protected]
Subject: [PATCH v1] net/e1000: fix the invalid flow control mode setting

E1000_CTRL register should be updated according to fc_conf->mode's value.

Fixes af75078fece3 ("first public release")
---
 drivers/net/e1000/igb_ethdev.c | 34
++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
(quoted diff) +0 -0

b/drivers/net/e1000/igb_ethdev.c index 647aa8d99..a8fc57d2c 100644

drivers/net/e1000/igb_ethdev.c +1 -0
@@ -3064,6 +3064,7 @@ eth_igb_flow_ctrl_set(struct rte_eth_dev *dev,
 struct rte_eth_fc_conf *fc_conf)
 	uint32_t rx_buf_size;
 	uint32_t max_high_water;
 	uint32_t rctl;
+	uint32_t ctrl;
 
 	hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private);

if (fc_conf->autoneg != hw->mac.autoneg) @@ -3101,6 +3102,39
@@ eth_igb_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)

drivers/net/e1000/igb_ethdev.c +3 -0
 			rctl &= ~E1000_RCTL_PMCF;
 
 		E1000_WRITE_REG(hw, E1000_RCTL, rctl);
+
+		/*
+		 * check if we want to change flow control mode - driver

doesn't have native

drivers/net/e1000/igb_ethdev.c +6 -0
+		 * capability to do that, so we'll write the registers ourselves
+		 */
+		ctrl = E1000_READ_REG(hw, E1000_CTRL);
+
+		/*
+		 * set or clear E1000_CTRL_RFCE and E1000_CTRL_TFCE bits

depending

drivers/net/e1000/igb_ethdev.c +24 -1
+		 * on configuration
+		 */
+		switch (fc_conf->mode) {
+		case RTE_FC_NONE:
+			ctrl &= ~E1000_CTRL_RFCE & ~E1000_CTRL_TFCE;
+			break;
+		case RTE_FC_RX_PAUSE:
+			ctrl |= E1000_CTRL_RFCE;
+			ctrl &= ~E1000_CTRL_TFCE;
+			break;
+		case RTE_FC_TX_PAUSE:
+			ctrl |= E1000_CTRL_TFCE;
+			ctrl &= ~E1000_CTRL_RFCE;
+			break;
+		case RTE_FC_FULL:
+			ctrl |= E1000_CTRL_RFCE | E1000_CTRL_TFCE;
+			break;
+		default:
+			PMD_INIT_LOG(ERR, "invalid flow control mode");
+			return -EINVAL;
+		}
+
+		E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
+
 		E1000_WRITE_FLUSH(hw);
 
 		return 0;
--

2.25.1

Applied
#2 lore raw
Quoted 10 lines

-----Original Message-----
From: dev <[email protected]> On Behalf Of Guo, Jia
Sent: Wednesday, January 20, 2021 3:19 PM
To: Wu, Wenjun1 <[email protected]>; [email protected]
Cc: [email protected]
Subject: Re: [dpdk-dev] [PATCH v1] net/e1000: fix the invalid flow control mode setting

Quoted 16 lines
Quoted 14 lines

-----Original Message-----
From: Wu, Wenjun1 <[email protected]>
Sent: Wednesday, January 20, 2021 2:54 PM
To: [email protected]; Guo, Jia <[email protected]>
Cc: Wu, Wenjun1 <[email protected]>; [email protected]
Subject: [PATCH v1] net/e1000: fix the invalid flow control mode setting

E1000_CTRL register should be updated according to fc_conf->mode's value.

Fixes af75078fece3 ("first public release")

Applied to dpdk-next-net-intel.

Thanks
Qi