From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
	by inbox.dpdk.org (Postfix) with ESMTP id 085DD468C4
	for <public@inbox.dpdk.org>; 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 F215B42E5D;
	Tue, 10 Jun 2025 11:27:01 +0200 (CEST)
Received: from smtpbgsg2.qq.com (smtpbgsg2.qq.com [54.254.200.128])
 by mails.dpdk.org (Postfix) with ESMTP id 3CA7F42E6D
 for <stable@dpdk.org>; Tue, 10 Jun 2025 11:27:00 +0200 (CEST)
X-QQ-mid: zesmtpsz7t1749547618te3cbede3
X-QQ-Originating-IP: CfpNxXCGsKckOAi1P1HkLrTDdIhw2bUP1djqh3AEN7s=
Received: from lap-jiawenwu.trustnetic.com ( [36.20.60.58])
 by bizesmtp.qq.com (ESMTP) with 
 id ; Tue, 10 Jun 2025 17:26:57 +0800 (CST)
X-QQ-SSF: 0000000000000000000000000000000
X-QQ-GoodBg: 0
X-BIZMAIL-ID: 3034821743471028116
EX-QQ-RecipientCnt: 3
From: Jiawen Wu <jiawenwu@trustnetic.com>
To: mengyuanlou@net-swift.com
Cc: Jiawen Wu <jiawenwu@trustnetic.com>,
	stable@dpdk.org
Subject: [PATCH 07/12] net/ngbe: fix MAC control frame forwarding
Date: Tue, 10 Jun 2025 17:26:34 +0800
Message-Id: <20250610092639.41216-8-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: OUyKUPM3d6L7Qg0lPDfY4dowPa9fEuFtqDvkJS1wJOl7Ue494iS5BW6y
 Dowy0LwLG5cfb0cWT+Lt0pLlFKYZ+ZRcIet6N3qFW8yOjRnExE3razU8wBlHVmEnAC6jvYJ
 2WXm0hMoAtPQhOJaL2eKGcQhoT1Sl4+4J2iD2PkAH9DD0X49WJSZYBTqq3aN1MJJy8/BvES
 3v8TLr+1FESQ/HO/VznF74YPJzZZ/VgSMMPurhASqwRNynmCpPlRPgiHxNofW2syBwBHagC
 4WCDbQpNC4JR5vbu2i8dMHhgD2TA7kgypvUHGqUBzDt++Rzqxj3OBJLAVMkpqNIIGMC79y2
 /srxrJEZUAxIY+KRmnqqoOhhdjdgzE8BPu6g6ZgDPslLGhfOVz0k8ko7ZiYP3m9JnWCNxbF
 BeXVyp7TjIQaqLXJP3RV+ar3dFK1NtCREEsOzCBHEGlEIR7O7vcv6SA2+xtNFVLIKf+VlYh
 rljUTw0GHy3D0Nw0IL7vJQBYrkmwGvay2997/0FwhBrjqeOy0dxNCuXA2fKFAG2wG7uEAJj
 mqUPpvb6g57IaaNU2LAJrA0qVhjoS+iBHjWEFFUTGzzCA31JwkApMgW4C+/HsOHJ0ZJeaVA
 O6k56VjFrAEIGv1hH3iijx2KqT16v+CbaEjMEqTJCwhrJOF5qluZxiEC1z/9h5NopMn6dJB
 fhUjqZ2VPi7m/78zZvJ8uWT7S0iu6oHZvd5as3D4gYKYRMFOqHXQymEhEaaq26/UHsQPaz+
 iq88Xh9HnEYXpOE8NJrGuXfiG3umtoHzOurGwJYJTZ3kYzHE23LO2bSfdGmlzG21E1Rt9pp
 DRRdcbSa5VqdeZ42kd9EG1NZt8zbtzHW7yEpjQj7OMhLN04iUSEIeNOqq85s9/U9DAzQFFq
 uFK0rL/Lj0q22Oc8+nTEGKA5+9SjNhIa1DMBvZ42UdJSHlDWT4UDqSvJ2bBgD/wTsj1TVqQ
 msMFa5N10XR58bveUKgFklggzqJEMk8qOOrVJMXQ+ep4NMhlstQQBimt1LE1RVmI4GFevKw
 aWvujW7Q++qcWC1Y7mIjF2IZvX+zv00xf9d6UdZN1+kZq+x1Lhv/PzrjGG0F/XT3Ms0txRD
 e1qIZhV8H01gPm95dnpc5Ygb8ImH4tbT/d9lNzBAAOZ
X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w=
X-QQ-RECHKSPAM: 0
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
 <mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
 <mailto:stable-request@dpdk.org?subject=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 <jiawenwu@trustnetic.com>
---
 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