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 26742468C4 for ; Tue, 10 Jun 2025 11:21:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1FE5742E6F; Tue, 10 Jun 2025 11:21:56 +0200 (CEST) Received: from smtpbgsg2.qq.com (smtpbgsg2.qq.com [54.254.200.128]) by mails.dpdk.org (Postfix) with ESMTP id 17F0142E76 for ; Tue, 10 Jun 2025 11:21:53 +0200 (CEST) X-QQ-mid: esmtpgz11t1749547304t64e5bd4f X-QQ-Originating-IP: MTk6M47sUMxfb+c5SzfV5+Y9lSoIzGR04YA0otu1ECE= Received: from lap-jiawenwu.trustnetic.com ( [36.20.60.58]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 10 Jun 2025 17:21:43 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 18177221941815741640 EX-QQ-RecipientCnt: 3 From: Jiawen Wu To: mengyuanlou@net-swift.com Cc: Jiawen Wu , stable@dpdk.org Subject: [PATCH 07/12] net/ngbe: fix MAC control frame forwarding Date: Tue, 10 Jun 2025 17:21:21 +0800 Message-Id: <20250610092126.51960-8-jiawenwu@trustnetic.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20250610092126.51960-1-jiawenwu@trustnetic.com> References: <20250610092126.51960-1-jiawenwu@trustnetic.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-QQ-SENDSIZE: 520 Feedback-ID: esmtpgz:trustnetic.com:qybglogicsvrgz:qybglogicsvrgz8a-1 X-QQ-XMAILINFO: NjuDfT6zrIZccXyQ7hvf9B5MgQjmmbOAbhz8oW9LVS2av2SFbEo6LHiS A6t6osqxw2DnlfXea+9mYOfNvfmX6Pnmdb+A2FJxAOTGZYV6HV6Xrbn+AqkZp9FI6oxfC3h Hbs551b50wNa9iT9IXzg/MtcVkpeGWiVQGmHI4JifgTEzrbalyK4NIFqqTPd174e0hG09Ds VBS2lni7/55ZXtBBCc+RAvVpJwLNDw5ydyTsajwvc4qMVqlzusvwZjYKUTgjMCbbLFL6kRa axGWL1wQ3hnWVUfEFE0Utq4CCMdGSY7j4ju9c2RPhKZ+DAvFv/ngf4Joj1tzTx94Ev0G46v F7jBqQdXzJyROLWkHKQjexhx5TmpL9KR9oEgA2zcgSs1nMyumFQy7Rrb2w8YZ2HQ2+aDuH6 7eb/fklW22gNYyuu3DuDwLYL2z1dbQijtVVoosUUyYm21u4EtnoEqZpmCj03V8HR3ttk1Qx qH5sCfLEmPNzJmvRSucRfkFZKMqWknjVGfQ2izZGehBdmagP+nDzii6gVYSU/ekTw+8UtbM SXqvCvN0th6OEQUS1lnPnQh9wiGJTOlUT1U/SYBe4lrO5a5QBO5gV1uhojONBt5psI1py15 OA4JgkexJvthsjtmpMmOahwyQ4b3uz5EamR6c+OoYiKOQnjtuegJ0H4sWDbTYpMswVgpwWO vlVi3IAP6SJUq5C7R+hYsXnVGEI08/278+AAJxrr3uxXNEfc8FicjeRYf9OF79akaXs7AUP wRnl16L4Vzd7l40oxBbjig2rGhUnteetulpwHT7CPU+wyXiS8R7wBkKy3ohMP/4OZhfdx15 SsfrzR+UV8i+5FF0MToiW3OEiyc+kvptfJVbYtNBkmAsh93RjrU/4O5OYlqIVngLFbG8wFE eUHjdOY+ZlNX8YHCYO/ebNOZYMpTAJkwnvM9qBXU5RjSAL+2BjN28JEBcoyM12tJ5aaQ/CR 48L8kdvXFMaNoafPmnp39LKjyA3SB9sOThdVlPPUqdE/U88zQTms/jmVdtczxuPOOG1Bsac 9esv7TNCOinDp3IO3M10rpzZrsWq0= X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= 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: f40e9f0e2278 ("net/ngbe: support flow control") Cc: stable@dpdk.org Signed-off-by: Jiawen Wu --- drivers/net/ngbe/base/ngbe_hw.c | 9 +++++++++ drivers/net/ngbe/base/ngbe_type.h | 1 + drivers/net/ngbe/ngbe_ethdev.c | 1 + 3 files changed, 11 insertions(+) diff --git a/drivers/net/ngbe/base/ngbe_hw.c b/drivers/net/ngbe/base/ngbe_hw.c index 6688ae6a31..bf09f8a817 100644 --- a/drivers/net/ngbe/base/ngbe_hw.c +++ b/drivers/net/ngbe/base/ngbe_hw.c @@ -865,6 +865,15 @@ s32 ngbe_setup_fc_em(struct ngbe_hw *hw) goto out; } + /* + * Reconfig mac ctrl frame fwd rule to make sure it still + * working after port stop/start. + */ + wr32m(hw, NGBE_MACRXFLT, NGBE_MACRXFLT_CTL_MASK, + (hw->fc.mac_ctrl_frame_fwd ? + NGBE_MACRXFLT_CTL_NOPS : NGBE_MACRXFLT_CTL_DROP)); + ngbe_flush(hw); + err = hw->phy.set_pause_adv(hw, reg_cu); out: diff --git a/drivers/net/ngbe/base/ngbe_type.h b/drivers/net/ngbe/base/ngbe_type.h index 7a3b52ffd4..fc571c7457 100644 --- a/drivers/net/ngbe/base/ngbe_type.h +++ b/drivers/net/ngbe/base/ngbe_type.h @@ -112,6 +112,7 @@ struct ngbe_fc_info { u32 high_water; /* Flow Ctrl High-water */ u32 low_water; /* 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/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c index 08e87471f6..a8f847de8d 100644 --- a/drivers/net/ngbe/ngbe_ethdev.c +++ b/drivers/net/ngbe/ngbe_ethdev.c @@ -2420,6 +2420,7 @@ ngbe_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) hw->fc.low_water = 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 = hw->mac.fc_enable(hw); -- 2.48.1