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 6D2CE46BAE for ; Fri, 18 Jul 2025 21:38:00 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6824E40611; Fri, 18 Jul 2025 21:38:00 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 3367B40611 for ; Fri, 18 Jul 2025 21:37:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5lrcjMFRbQwJcQlqd6t6ys7FuVBWda6Z/WAEmrXROZE=; b=aupZCGL6Tc161pZ2pD6y/glV06vKJGpmc8ggaIvKmgH/cIRoNoNc6dxpcHzhz1P9yL0Gpl WnT1czOCd0ZD7HI0bhMPmE7wqzR7R7rNUFTVb1Zn+kc9RrSqnWIwoXJ8rGVJaJWA+k+n2G Z800if5R3Mn6crDmWJbMTgyeg8ajrcc= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-620-jz9vhda9M7SoCNZQFKhHkg-1; Fri, 18 Jul 2025 15:37:55 -0400 X-MC-Unique: jz9vhda9M7SoCNZQFKhHkg-1 X-Mimecast-MFC-AGG-ID: jz9vhda9M7SoCNZQFKhHkg_1752867474 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8FE69195608F; Fri, 18 Jul 2025 19:37:54 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 206DB18003FC; Fri, 18 Jul 2025 19:37:52 +0000 (UTC) From: Kevin Traynor To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/ngbe: fix MAC control frame forwarding' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:31:19 +0100 Message-ID: <20250718193247.1008129-145-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: y88_CohEV0inzU8ss6595ZJY4uTHl1UfLLfwg0Z_3e4_1752867474 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 Hi, FYI, your patch has been queued to stable release 24.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/23/25. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/e58a17a64a7eede07d9ba4994a7feff0286878a0 Thanks. Kevin --- >From e58a17a64a7eede07d9ba4994a7feff0286878a0 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Fri, 13 Jun 2025 16:41:54 +0800 Subject: [PATCH] net/ngbe: fix MAC control frame forwarding [ upstream commit 31ae872822cdc89cd00926c3e162781ef927ca24 ] 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") 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 1caeececf0..0b7f3e8bae 100644 --- a/drivers/net/ngbe/base/ngbe_hw.c +++ b/drivers/net/ngbe/base/ngbe_hw.c @@ -865,4 +865,13 @@ s32 ngbe_setup_fc_em(struct ngbe_hw *hw) } + /* + * 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); diff --git a/drivers/net/ngbe/base/ngbe_type.h b/drivers/net/ngbe/base/ngbe_type.h index a987bbe25b..6a3cada617 100644 --- a/drivers/net/ngbe/base/ngbe_type.h +++ b/drivers/net/ngbe/base/ngbe_type.h @@ -109,4 +109,5 @@ struct ngbe_fc_info { 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 */ 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 @@ -2421,4 +2421,5 @@ ngbe_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) 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.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:16.103336375 +0100 +++ 0145-net-ngbe-fix-MAC-control-frame-forwarding.patch 2025-07-18 20:29:11.121907916 +0100 @@ -1 +1 @@ -From 31ae872822cdc89cd00926c3e162781ef927ca24 Mon Sep 17 00:00:00 2001 +From e58a17a64a7eede07d9ba4994a7feff0286878a0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 31ae872822cdc89cd00926c3e162781ef927ca24 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 6688ae6a31..bf09f8a817 100644 +index 1caeececf0..0b7f3e8bae 100644 @@ -24 +25 @@ -@@ -866,4 +866,13 @@ s32 ngbe_setup_fc_em(struct ngbe_hw *hw) +@@ -865,4 +865,13 @@ s32 ngbe_setup_fc_em(struct ngbe_hw *hw) @@ -39 +40 @@ -index 7a3b52ffd4..fc571c7457 100644 +index a987bbe25b..6a3cada617 100644 @@ -42 +43 @@ -@@ -113,4 +113,5 @@ struct ngbe_fc_info { +@@ -109,4 +109,5 @@ struct ngbe_fc_info {