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 37F9E42ECF for ; Thu, 20 Jul 2023 17:22:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3433442D38; Thu, 20 Jul 2023 17:22:12 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 1663F42D2D for ; Thu, 20 Jul 2023 17:22:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866530; 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=t1U4LXR7o9VWf8I9dHrLL9m4MenD44EvuEtDMIG3Ld8=; b=IW/O1JcJxOcAWzE28u3iYElg+QsQmIeiJbT1hRwU957//hT82FibJfddTKVwJR8BBEQ2JB N1AP5XZDfR56O88FFJWFsUD4i5O4GocuXmUocyX93Fqr41GqgNtWogyLcIHNPfFNvfodsb 8Axde8gn0Bs1hoctYfexT0U58U021RM= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-549-XdhEHb-mOFyu2IZ7ETBF_g-1; Thu, 20 Jul 2023 11:21:06 -0400 X-MC-Unique: XdhEHb-mOFyu2IZ7ETBF_g-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 764BA3C2451D; Thu, 20 Jul 2023 15:20:43 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61C48492C13; Thu, 20 Jul 2023 15:20:42 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix never set MAC flow control' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:17:42 +0100 Message-ID: <20230720151942.262154-31-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 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 21.11.5 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/25/23. 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/40779432859e80e96f6be30e84df6866abe95c1a Thanks. Kevin --- >From 40779432859e80e96f6be30e84df6866abe95c1a Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Mon, 22 May 2023 21:17:36 +0800 Subject: [PATCH] net/hns3: fix never set MAC flow control [ upstream commit 2350eb39f337f9e8d798f8dd1d658834e3981e9e ] When some hardware and firmware support speed auto-negotiation but do not support flow control auto-negotiation, driver can never successfully set MAC flow control by flow_ctrl_set() API. So only tell user driver doesn't support flow control autoneg when user enable it. Fixes: 1f411e31a826 ("net/hns3: support flow control autoneg for copper port") Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_ethdev.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 696530f779..6382384301 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -5330,14 +5330,5 @@ hns3_check_fc_autoneg_valid(struct hns3_hw *hw, uint8_t autoneg) if (!pf->support_fc_autoneg) { if (autoneg != 0) { - hns3_err(hw, "unsupported fc auto-negotiation setting."); - return -EOPNOTSUPP; - } - - /* - * Flow control auto-negotiation of the NIC is not supported, - * but other auto-negotiation features may be supported. - */ - if (autoneg != hw->mac.link_autoneg) { - hns3_err(hw, "please use 'link_speeds' in struct rte_eth_conf to disable autoneg!"); + hns3_err(hw, "unsupported fc auto-negotiation."); return -EOPNOTSUPP; } -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:17:58.788548805 +0100 +++ 0031-net-hns3-fix-never-set-MAC-flow-control.patch 2023-07-20 16:17:54.567750124 +0100 @@ -1 +1 @@ -From 2350eb39f337f9e8d798f8dd1d658834e3981e9e Mon Sep 17 00:00:00 2001 +From 40779432859e80e96f6be30e84df6866abe95c1a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2350eb39f337f9e8d798f8dd1d658834e3981e9e ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index d97280e647..8f819d5f23 100644 +index 696530f779..6382384301 100644 @@ -25 +26 @@ -@@ -5305,14 +5305,5 @@ hns3_check_fc_autoneg_valid(struct hns3_hw *hw, uint8_t autoneg) +@@ -5330,14 +5330,5 @@ hns3_check_fc_autoneg_valid(struct hns3_hw *hw, uint8_t autoneg)