From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2F65A468C4 for ; Tue, 10 Jun 2025 11:27:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1C8B942E6F; Tue, 10 Jun 2025 11:27:02 +0200 (CEST) Received: from smtpbgau2.qq.com (smtpbgau2.qq.com [54.206.34.216]) by mails.dpdk.org (Postfix) with ESMTP id 000F842E5D for ; Tue, 10 Jun 2025 11:26:59 +0200 (CEST) X-QQ-mid: zesmtpsz7t1749547616t85edcb5e X-QQ-Originating-IP: eIhEj1BfKKQ1lrKIdx5z0uz9qArUiytqWRJcFNWEGRo= Received: from lap-jiawenwu.trustnetic.com ( [36.20.60.58]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 10 Jun 2025 17:26:55 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 13476957987894961311 EX-QQ-RecipientCnt: 3 From: Jiawen Wu To: mengyuanlou@net-swift.com Cc: Jiawen Wu , stable@dpdk.org Subject: [PATCH 06/12] net/txgbe: fix MAC control frame forwarding Date: Tue, 10 Jun 2025 17:26:33 +0800 Message-Id: <20250610092639.41216-7-jiawenwu@trustnetic.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20250610092639.41216-1-jiawenwu@trustnetic.com> References: <20250610092639.41216-1-jiawenwu@trustnetic.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-QQ-SENDSIZE: 520 Feedback-ID: zesmtpsz:trustnetic.com:qybglogicsvrgz:qybglogicsvrgz8a-1 X-QQ-XMAILINFO: Mv4I3q6U50FP1EhW+VspQ01VKMBYEGs3W9oaDTVuLtbfgrDLoVxia3jn MeJy/PtSpNxaVB6f8b7HMf3V27nRmS8Ah85lwim0EvgEATlsRf4DOQN6Phx6iW4OVS2URnm waPZ0XFAGsUGJ65JEtYBtvL+oUIS/G7eKLuyzoDMaqiwqEvOm17jICXfyjhN/o7QGNIU7cd HB59ty7jWm1Dz4ds9xhuXCv/XGtba5rM21AMlySsubJdN4zCtZ6rg74ZiwdPPKyHWxXSZUw LZp90tJYmKvvoZOthvjq2tIePk5Q2mZQfZCOnSFp0EyWH4N/0ZH1RcZyvkGnyWtJtsXz5hT LlswDXacbND4W66mY7pm6xZgC/HXN9I0o/8KzfevYChLVa0gZw0RJ32OCzBD7z7f8mTqnYR +jm0kUy+euM7OJJwgJxI//Sl9ynNorBzIFkyszGuja+7Hv9aA4EOedlgjZjRhVwcj726+Ly Q9iw/hV5Rep8mx9xQ+ezHuVwfvuzRcwlRPhauWydHzEWHmGxtW2z836tjlrxl0dbmZSZDcR MhqukO++ItvZ/lUnvLWDSVpAvjj1ahOUQMWZoLohc3bnzw9H+g6a7If6btmBeu6Jffk14Vo KOVCixF1oYZO0Mhfy5D1e2g1BIO86BhaGOFUx4j/vmuAUK857YwHuoWECw5hJ7ibGX9s1K7 v38Dk4Vr89iJF3hgORydLp/Fxd3ubxBt/umcU+567XDuKM+mAIO1Qa5sb51Z5KL2vDK5p05 5kAMMALMUxyAMWSRYrXpeULVERR3tfF2e3M0IYbSPeBgxc0dgdqfBbU9egzDB1QJBBqjcjv De39z6X0Xmi7LiOEoOr99imy0Kh85vVarQMS+qyGBWAkK01U2OCRIr9AK77YqCpAFDM9/LA ZSgqDb7OVNgdqxiP0hNQxcNlbBWs9f9VikUvCFIRW8UPytee1hu/QmFtaSwH+puxmE+Xo0K XRqwyjjl604baLkWNP+DlyXdaqJVaPkhkTyVTdHIpJyboYHBHwAcBZEAcPvCFKvjqZGNNl2 +3P9+EWIlNaqDaIBwfIw/Igh+/3/6gfUPz2gLFQpuLMVYNpX4QnC/ug/u3UAGAIAxtkkcME EsfWBv+SQTWSF6mjiZroJk1+L5G//5Z5AG28AVfp9cIRJ64geMr1tlH19WiP1dhWg== X-QQ-XMRINFO: Nq+8W0+stu50PRdwbJxPCL0= X-QQ-RECHKSPAM: 0 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Test Failure on the case "test_pause_fwd_port_stop_start", which expect MAC control frame forwarding setting still working after port stop/start. Fix the bug to pass the test case. Fixes: 69ce8c8a4ce3 ("net/txgbe: support flow control") Cc: stable@dpdk.org Signed-off-by: Jiawen Wu --- drivers/net/txgbe/base/txgbe_hw.c | 9 +++++++++ drivers/net/txgbe/base/txgbe_type.h | 1 + drivers/net/txgbe/txgbe_ethdev.c | 1 + 3 files changed, 11 insertions(+) diff --git a/drivers/net/txgbe/base/txgbe_hw.c b/drivers/net/txgbe/base/txgbe_hw.c index 76b9ee3c0a..42cd0e0e2c 100644 --- a/drivers/net/txgbe/base/txgbe_hw.c +++ b/drivers/net/txgbe/base/txgbe_hw.c @@ -226,6 +226,15 @@ s32 txgbe_setup_fc(struct txgbe_hw *hw) TXGBE_MD_DEV_AUTO_NEG, reg_cu); } + /* + * Reconfig mac ctrl frame fwd rule to make sure it still + * working after port stop/start. + */ + wr32m(hw, TXGBE_MACRXFLT, TXGBE_MACRXFLT_CTL_MASK, + (hw->fc.mac_ctrl_frame_fwd ? + TXGBE_MACRXFLT_CTL_NOPS : TXGBE_MACRXFLT_CTL_DROP)); + txgbe_flush(hw); + DEBUGOUT("Set up FC; reg = 0x%08X", reg); out: return err; diff --git a/drivers/net/txgbe/base/txgbe_type.h b/drivers/net/txgbe/base/txgbe_type.h index 383438ea3c..65527a22e7 100644 --- a/drivers/net/txgbe/base/txgbe_type.h +++ b/drivers/net/txgbe/base/txgbe_type.h @@ -299,6 +299,7 @@ struct txgbe_fc_info { u32 high_water[TXGBE_DCB_TC_MAX]; /* Flow Ctrl High-water */ u32 low_water[TXGBE_DCB_TC_MAX]; /* Flow Ctrl Low-water */ u16 pause_time; /* Flow Control Pause timer */ + u8 mac_ctrl_frame_fwd; /* Forward MAC control frames */ bool send_xon; /* Flow control send XON */ bool strict_ieee; /* Strict IEEE mode */ bool disable_fc_autoneg; /* Do not autonegotiate FC */ diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index e5736bf387..b68a0557be 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -3586,6 +3586,7 @@ txgbe_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) hw->fc.low_water[0] = fc_conf->low_water; hw->fc.send_xon = fc_conf->send_xon; hw->fc.disable_fc_autoneg = !fc_conf->autoneg; + hw->fc.mac_ctrl_frame_fwd = fc_conf->mac_ctrl_frame_fwd; err = txgbe_fc_enable(hw); -- 2.48.1