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 B903D46B72 for ; Mon, 14 Jul 2025 17:12:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B3F63402E7; Mon, 14 Jul 2025 17:12:30 +0200 (CEST) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id 21971402E7 for ; Mon, 14 Jul 2025 17:12:28 +0200 (CEST) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4560cdf235cso10527975e9.1 for ; Mon, 14 Jul 2025 08:12:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752505948; x=1753110748; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LnWpqtmb2fSkCwcNDc8SVAKMCU/xksMiypZKb81LkR8=; b=TN7ZNHS06IrxrSCzbtz07hFXBSH5fHWwFxI8ustghBN9bKQ+VKI0Va8LmzlpmIftON nhP0rhWyywTLY6fikFqrfz6759azmbggznzCpP1Sudp5fIhGG1QiLgGdm6FDm5xvyRTI 9DBcN/gGrsLdiWOylvrsa6qlyiz8nHL0SwWDlhVbL2fxfNmgeyUP2QhSXCphWC5jDSIB oSoJ/an16St0gpuBDyI0h63mSUCgTwT7Ye+Dr+yn8yRjA648EB1fnhk0ApQz0A0n8hoI HZD3uxHZIh2yeZVtgcmjzPlxKdAeqI3lQ4zDu+Be0c4M14TaP5HWTZNTyg5ohGbibaPa o5Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752505948; x=1753110748; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LnWpqtmb2fSkCwcNDc8SVAKMCU/xksMiypZKb81LkR8=; b=aLD2Jn4z7SdjujoCPZBvUtEU8Mxt6D5PVwHgyk9Br0QR5bx5gWxQYI8qGPhwcRPSDg A/48qnwe/XXu+ZtIzMF3F2xyBn9fc1Th4tEz8+DwjAYRpVx4QK29mlPuMD2xFuIQnieS C6WO8+xVqtpW6ObX7gd4Ad+mVCQDOzp5WPxPrj7Mt2d665aCUhNtLDdY/p8+/ycO+Swy Cju3p7LkDQR+JUM9OmdXiRnz7XMS2JOU3/MQ11JphHSOTqFm8rvfFQ/AiUdGfItfVtFO BZSiv5a3oGWmciqdjU8+XxZHeRWpfoVan+WyJsvcMC006mphxl1SuO4RZkMok6hZe8Im G6TQ== X-Gm-Message-State: AOJu0Yyg5APi6xnjdnUVzGMj+BR1xgVKGFoXDqZS4X2ShMToCcr2t1oJ zgMAdR6P9if2gwiWqemK3lAAtOU0pUks1+ovYxzfSZuB2yrqXchdbowN X-Gm-Gg: ASbGncukz43+kQEzAsUOY0jPDJnjRekMb/YMv8rCCshJ+iv2V3Nw806ISWHY9lORV/u mJTMRd9X/aXKN4fHG+VLH0L1PpkkA2VmScMA/yv2fbneOCFlCYxK6O70KYTqR2wdpO1RYmMerP/ w5o4JSEXKkcFWzw6KGp0qUVlNTXTnU5nAiHtSZP/28LcMdv0grj2QdZR1EKOW6ZqPI7JRYypBXy a99oBoaPwAANZUh0XSZ/5aM4bB5LgX6gE39GMGRpYU3VyUltiS7rCGAegjSwR8wjp02QF+ubkAK VaTN+K8hgLZJScAJoIrC8jM2W4kM45Ym+umU3YALHit4+mfz9kuPPOTSiYd5CsgLFicg0YL1rNo C0a5PhKyUi72OaTiZxy8Mh8KKuJB6 X-Google-Smtp-Source: AGHT+IHNVYt+0P3YSVucOgQMRF4n69cokMrUv+YIcQ1pHSXDXpZJMhhRUNw//36d+HQ1mubYRLX6Zw== X-Received: by 2002:a05:600c:4693:b0:456:496:2100 with SMTP id 5b1f17b1804b1-456049621efmr84473575e9.31.1752505947270; Mon, 14 Jul 2025 08:12:27 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:a923:75e5:f97f:ef33]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3b5e8dc201asm12531745f8f.22.2025.07.14.08.12.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jul 2025 08:12:26 -0700 (PDT) From: luca.boccassi@gmail.com To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe: fix MAC control frame forwarding' has been queued to stable release 22.11.9 Date: Mon, 14 Jul 2025 16:11:02 +0100 Message-ID: <20250714151121.219866-7-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250714151121.219866-1-luca.boccassi@gmail.com> References: <20250630122556.1133654-23-luca.boccassi@gmail.com> <20250714151121.219866-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.9 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/16/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/26cf3a4fe2094395d02bb289a408a2e438fe27ed Thanks. Luca Boccassi --- >From 26cf3a4fe2094395d02bb289a408a2e438fe27ed Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Fri, 13 Jun 2025 16:41:53 +0800 Subject: [PATCH] net/txgbe: fix MAC control frame forwarding [ upstream commit b71127393a37cda0de6ca088f9945ee1a148e712 ] 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") 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 4ad54c0ad6..3522c6ee45 100644 --- a/drivers/net/txgbe/base/txgbe_hw.c +++ b/drivers/net/txgbe/base/txgbe_hw.c @@ -176,6 +176,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 249a171191..3479639ec4 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 784b66a579..697f1db579 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -3406,6 +3406,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.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-14 16:09:40.979043714 +0100 +++ 0007-net-txgbe-fix-MAC-control-frame-forwarding.patch 2025-07-14 16:09:40.696448633 +0100 @@ -1 +1 @@ -From b71127393a37cda0de6ca088f9945ee1a148e712 Mon Sep 17 00:00:00 2001 +From 26cf3a4fe2094395d02bb289a408a2e438fe27ed Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b71127393a37cda0de6ca088f9945ee1a148e712 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 76b9ee3c0a..42cd0e0e2c 100644 +index 4ad54c0ad6..3522c6ee45 100644 @@ -24 +25 @@ -@@ -226,6 +226,15 @@ s32 txgbe_setup_fc(struct txgbe_hw *hw) +@@ -176,6 +176,15 @@ s32 txgbe_setup_fc(struct txgbe_hw *hw) @@ -41 +42 @@ -index 383438ea3c..65527a22e7 100644 +index 249a171191..3479639ec4 100644 @@ -53 +54 @@ -index e5736bf387..b68a0557be 100644 +index 784b66a579..697f1db579 100644 @@ -56 +57 @@ -@@ -3586,6 +3586,7 @@ txgbe_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) +@@ -3406,6 +3406,7 @@ txgbe_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)