diff mbox series

[v2] net/i40e: fix MAC loopback on X722

Message ID 20230314031619.12057-1-wenjing.qiao@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Qi Zhang
Headers
Series [v2] net/i40e: fix MAC loopback on X722 |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/github-robot: build success github build: passed
ci/intel-Testing success Testing PASS
ci/intel-Functional success Functional PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/loongarch-compilation success Compilation OK
ci/loongarch-unit-testing success Unit Testing PASS
ci/iol-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-abi-testing success Testing PASS

Commit Message

Wenjing Qiao March 14, 2023, 3:16 a.m. UTC 
  If enabling MAC loopback mode on X722 NIC, transmitted packets are not
seen in the receive queue. The root cause is using wrong loopback mode
bits. Correct it according to the X722 datasheet.

Fixes: 3a838ab649df ("net/i40e: support MAC loopback")
Fixes: 5712e6407089 ("net/i40e: revert enhancing loopback AQ command")

Signed-off-by: Wenjing Qiao <wenjing.qiao@intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 17 ++++++++++++++---
 drivers/net/i40e/i40e_ethdev.h |  3 +++
 2 files changed, 17 insertions(+), 3 deletions(-)

Comments

Yuan, DukaiX March 16, 2023, 2:05 a.m. UTC | #1 
> -----Original Message-----
> From: Qiao, Wenjing <wenjing.qiao@intel.com>
> Sent: 2023年3月14日 11:16
> To: Zhang, Yuying <yuying.zhang@intel.com>; Xing, Beilei
> <beilei.xing@intel.com>
> Cc: Yuan, DukaiX <dukaix.yuan@intel.com>; dev@dpdk.org; Qiao, Wenjing
> <wenjing.qiao@intel.com>
> Subject: [PATCH v2] net/i40e: fix MAC loopback on X722
> 
> If enabling MAC loopback mode on X722 NIC, transmitted packets are not
> seen in the receive queue. The root cause is using wrong loopback mode bits.
> Correct it according to the X722 datasheet.
> 
> Fixes: 3a838ab649df ("net/i40e: support MAC loopback")
> Fixes: 5712e6407089 ("net/i40e: revert enhancing loopback AQ command")
> 
> Signed-off-by: Wenjing Qiao <wenjing.qiao@intel.com>
> ---
Tested-by: Dukai Yuan<dukaix.yuan@intel.com>
Qi Zhang March 16, 2023, 2:21 a.m. UTC | #2 
> -----Original Message-----
> From: Yuan, DukaiX <dukaix.yuan@intel.com>
> Sent: Thursday, March 16, 2023 10:05 AM
> To: Qiao, Wenjing <wenjing.qiao@intel.com>; Zhang, Yuying
> <yuying.zhang@intel.com>; Xing, Beilei <beilei.xing@intel.com>
> Cc: dev@dpdk.org
> Subject: RE: [PATCH v2] net/i40e: fix MAC loopback on X722
> 
> > -----Original Message-----
> > From: Qiao, Wenjing <wenjing.qiao@intel.com>
> > Sent: 2023年3月14日 11:16
> > To: Zhang, Yuying <yuying.zhang@intel.com>; Xing, Beilei
> > <beilei.xing@intel.com>
> > Cc: Yuan, DukaiX <dukaix.yuan@intel.com>; dev@dpdk.org; Qiao, Wenjing
> > <wenjing.qiao@intel.com>
> > Subject: [PATCH v2] net/i40e: fix MAC loopback on X722
> >
> > If enabling MAC loopback mode on X722 NIC, transmitted packets are not
> > seen in the receive queue. The root cause is using wrong loopback mode
> bits.
> > Correct it according to the X722 datasheet.
> >
> > Fixes: 3a838ab649df ("net/i40e: support MAC loopback")
> > Fixes: 5712e6407089 ("net/i40e: revert enhancing loopback AQ command")
> >
> > Signed-off-by: Wenjing Qiao <wenjing.qiao@intel.com>
> > ---
> Tested-by: Dukai Yuan<dukaix.yuan@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi
diff mbox series

Patch

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index a982e42264..d742fd0d2b 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -2415,10 +2415,21 @@  i40e_dev_start(struct rte_eth_dev *dev)
 		}
 	}
 
+	/* Disable mac loopback mode */
+	if (dev->data->dev_conf.lpbk_mode == I40E_AQ_LB_MODE_NONE) {
+		ret = i40e_aq_set_lb_modes(hw, I40E_AQ_LB_MODE_NONE, NULL);
+		if (ret != I40E_SUCCESS) {
+			PMD_DRV_LOG(ERR, "fail to set loopback link");
+			goto tx_err;
+		}
+	}
+
 	/* Enable mac loopback mode */
-	if (dev->data->dev_conf.lpbk_mode == I40E_AQ_LB_MODE_NONE ||
-	    dev->data->dev_conf.lpbk_mode == I40E_AQ_LB_PHY_LOCAL) {
-		ret = i40e_aq_set_lb_modes(hw, dev->data->dev_conf.lpbk_mode, NULL);
+	if (dev->data->dev_conf.lpbk_mode == I40E_AQ_LB_MODE_EN) {
+		if (hw->mac.type == I40E_MAC_X722)
+			ret = i40e_aq_set_lb_modes(hw, I40E_AQ_LB_MAC_LOCAL_X722, NULL);
+		else
+			ret = i40e_aq_set_lb_modes(hw, I40E_AQ_LB_MAC, NULL);
 		if (ret != I40E_SUCCESS) {
 			PMD_DRV_LOG(ERR, "fail to set loopback link");
 			goto tx_err;
diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
index 7c4cc44a27..9b806d130e 100644
--- a/drivers/net/i40e/i40e_ethdev.h
+++ b/drivers/net/i40e/i40e_ethdev.h
@@ -48,6 +48,9 @@ 
 #define I40E_MAX_VF               128
 /*flag of no loopback*/
 #define I40E_AQ_LB_MODE_NONE	  0x0
+#define I40E_AQ_LB_MODE_EN	  0x01
+#define I40E_AQ_LB_MAC		  0x01
+#define I40E_AQ_LB_MAC_LOCAL_X722 0x04
 /*
  * vlan_id is a 12 bit number.
  * The VFTA array is actually a 4096 bit array, 128 of 32bit elements.