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 93B99468C4 for ; Tue, 10 Jun 2025 11:23:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 89FAF42E5D; Tue, 10 Jun 2025 11:23:01 +0200 (CEST) Received: from smtpbguseast1.qq.com (smtpbguseast1.qq.com [54.204.34.129]) by mails.dpdk.org (Postfix) with ESMTP id 1231A42E6D for ; Tue, 10 Jun 2025 11:22:58 +0200 (CEST) X-QQ-mid: esmtpgz12t1749547376t673562d4 X-QQ-Originating-IP: lEpRqc4dk43WPfjyNixnTqfS5lPM4IZ330F9rMZ7Kh8= Received: from w-MS-7E16.trustnetic.com ( [36.20.60.58]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 10 Jun 2025 17:22:55 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 8104641201532788952 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:22:31 +0800 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250610092237.232224-1-jiawenwu@trustnetic.com> References: <20250610092237.232224-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: MLgcc2cMgG2Wpvp8FY206DJkDz6ddiJOaSZbyVZ27wTG4W7pyYvgIgh0 ExOWZq+my4vKELZG0MBbXcloqMIzy/4P5dM7JpqaHMqESO34i1Dr1yYkDfAz7QNgBcLDhF+ +6SbmqLbavR83i7mBTP/lucNdXqYbxqTnW/w5618y0lFoU9Ztm/ZbmrFy6rU+cKzXV4Ewq5 8aJ1ENSgdBm54UDfEIGJPGkYDbXJKMSjWqc91sAK/AdIJebckx+p2wdyUowKzItPbCtJjZf BBbmWfv+PMYxwDorQoTMw9opI1MUJddFgVslUATwNYmO/CZm2P/9JlPLznSP5LOag/mfxjZ 8vgbfdq9Wc4xsanflwBZa/ylvgFpysqmlZmQ6IYwQP+IoBuVnp6IhfukMkpfyxRpDvY33s0 HLTHO/oAm7BmKz68DcHvb1SenM3KZ/ChxykkKl6kpvFvTA4wPkmPcNuXWI4bIiVZh+mXEpm AHu+93rgk0oSM75eT5rJcpRqAD09+TLc15aEMBQDIrWWG1QkEyqjRpzpjsm5Art6KzrNPqM LLWGyOS936f3OGqXYuNd/v+krWf/rdNJOfAY01Tj7Uj2egoo0zVn12cPKWUX36PyZCr/Sq/ S8xuPkOtsA2qos6WAWDI0rw2qr9kY3BNL7Rxgo2/xpfEEHTYXXdqdn+rV3zvIzI8tG7c0tn wc4WG4AQbVlFfKPj41T17IAIu0oD6Xq9KPdsl4tJNsh8v28AJmIaAK/chDybhD88RAlsPPq ZUl4OeyOLGtfSNPCqUZr+WSDqVubGTXJwENQEpVAoMcGrg6fZf1sANpt397kUwMgZqsAxLS Imtc82NT8rerjjKsRtiz+83ksY5vOhZ+N6h8c43RHPM620wRiLk/Gro29/kO88J1k0TmNQ1 1pAW+NeZCOWskeRgJpX+9LlkGx3aIB/t80jwD3gdKwhBwSlgQmye/rTz6HaxDoqtgLfQUKs 8hriAiJf6V6AN7kFw6cS4OtTZSSUoqa3HjaezcAE4Pr2oTflDAYbePxnQPPksRzeGUQs2WW Ns4xj3lthCsWcJ9SYpgGXBy9VSrVebw7nrL7rgYJkgJDi7vOMMZSudic19LmBFtuEpr4gqx JKjhklQPEdBfhowETmSmOAIJvj73qxDLeapdqkm1O99 X-QQ-XMRINFO: MSVp+SPm3vtS1Vd6Y4Mggwc= 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