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 5F163468C4 for ; Tue, 10 Jun 2025 11:21:47 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 53B4642E5D; Tue, 10 Jun 2025 11:21:47 +0200 (CEST) Received: from smtpbg151.qq.com (smtpbg151.qq.com [18.169.211.239]) by mails.dpdk.org (Postfix) with ESMTP id 532DB42E6D for ; Tue, 10 Jun 2025 11:21:45 +0200 (CEST) X-QQ-mid: esmtpgz11t1749547302tcf25ce0f X-QQ-Originating-IP: fiCiV0e0WVeYMIC0ouaxrtx9TBGkdw29B1Cy6jlqhlY= Received: from lap-jiawenwu.trustnetic.com ( [36.20.60.58]) by bizesmtp.qq.com (ESMTP) with id ; Tue, 10 Jun 2025 17:21:41 +0800 (CST) X-QQ-SSF: 0000000000000000000000000000000 X-QQ-GoodBg: 0 X-BIZMAIL-ID: 9826872908668227605 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:21:20 +0800 Message-Id: <20250610092126.51960-7-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: Ns2J6Ww7lX5lVZCGP2e81vx4f6d6vJXXejThZmSzue1nKMQB3tx/tZ0T cgzWVkZeZ1qJgKmqpuOmbjjlWjnNXq/NX3EyCS0fZf5AINu1l2LOA5Dd12kA/p7JUpSx62P 61V+HVVcHd3w6d6vY8y5r7WqXbKWjXbT99nXOr5jMX3+9nZpAF6Lw33aQXzN1Z/0ubJrgmh 3udWfUtDV88+AJ1Got+RtbM2Au5Vf7G5HJDyGPUjO2auka3OIQsKg2sPUJQN7GKXMonQegb rXszwIzK6W6Ozkr/g0E7LgwRyWmNSIBD7sjVYk+3ok3YqUAqsVb1fM4owDFWWt8WM1uSfrt mjv9ow6o5bbZfD57w+dL/1BRnPeCCSdYf5I1ob8BTRuPnaNFb49F9tIKizMiJHo1u0Tz97F aGKdxA4K9915c8MXnVT2ZaJ8qnVvUyK0actI70KNVBUIUH6Zpy7JvwII7PvviYKWVTeLGRE hy1m2REOl+GL3Wy3laVxbC96GsBOnZHImDIw0UfQxxEwmwyFZBvM/J5RUaeC6CCqltLDPVA S/m5R48OABRRb2tfDVESAwb9kURdc1aweMz5jMP+N5mcbIXEb2HjieQPxHvbOHYdj8hUCJo OrGwBTy55/9FZlvv9cwJWdGXUA/bk3T7FuD76I+ZRiMhM5LWzJWJPh9og7OM7FtdYTBwV8R p822xDgPeXNWx71AjYLrGQE+AXUFicsLIJYE0/YgSKySaNoduAvcU2puG2HRRpotYG4oDna 6snalRrPs3xooKCnS7Iw92GikcUGCCGEW5vUMbMp48H1OhE73tURZ6aOSDSB4QD0xN+h4cT /uFSNWPllUEFBXb9ej7tcG3lJwvSQRioo6urY3K3hY2sFwfNDRKPxqANij70bwPIj6bUMSK pxRK8eHrDuC9aXP1TbYEGGRcJqYTFo69ItHyK6BgRxShkqkUUTNT4Vn/BGrXfXH4tZgCi8o 3IKPCE8CoAksYeIuGzknv6OR4LT5ukOnJ5QafM5AApxkqXpKK/lDkD+yVRDeRQOqW80t2m1 u3zdhB69/Ad9dbLv4++VH0vPNR/C0K1mR+519jGogm7ibaJj5IJP/A36+XHYA= 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: 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