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 B5FB743DF8 for ; Thu, 4 Apr 2024 11:52:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 93BE540268; Thu, 4 Apr 2024 11:52:29 +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 1B7B54025D for ; Thu, 4 Apr 2024 11:52:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712224347; 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; bh=PTYjHIrVY8NECa46Dnjka0Qhc6LSBRuIwnQTOg15no0=; b=Iv/lIs7XXYQ4EjCSqaCxE7X5yElKx6i8qk9qnziL1wYYqU6dIOvZ2TMYjNDZBLIZc7n3EP erLgKIS1pr1m1BBFe7Y9JYhAZQeaBX2skly89ns00vnWWlZ0sTYCheJhCyo7qnVdrRku42 sVDiD/Ygx8xgD2Fo6ZT78861IxI6TxI= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-627-dhD2eBwUOUuuLyM1y9ge3g-1; Thu, 04 Apr 2024 05:52:25 -0400 X-MC-Unique: dhD2eBwUOUuuLyM1y9ge3g-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id A60A6285F98F; Thu, 4 Apr 2024 09:52:25 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0D2A23C24; Thu, 4 Apr 2024 09:52:24 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: dpdk stable Subject: patch 'net/hns3: enable PFC for all user priorities' has been queued to stable release 21.11.7 Date: Thu, 4 Apr 2024 10:51:31 +0100 Message-ID: <20240404095155.155427-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/09/24. 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/5c731f2f53b8af0685f58c16dfe7fa1c9e1ab167 Thanks. Kevin --- >From 5c731f2f53b8af0685f58c16dfe7fa1c9e1ab167 Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Wed, 6 Mar 2024 17:20:47 +0800 Subject: [PATCH] net/hns3: enable PFC for all user priorities [ upstream commit aae6989df36c105b917cf69975c075dfde2e6b84 ] When user set TC number to 4 and enable PFC and ETS by dev_configure, driver only enable user priority 0-3. The packet with user priority 4-7 cannot trigger PFC frame. Fix by enabling PFC for all user priorities. By the way, the nb_tcs from user can never be 0 because of the ahead check in driver. So remove this redundant code. Fixes: 62e3ccc2b94c ("net/hns3: support flow control") Signed-off-by: Jie Hai --- drivers/net/hns3/hns3_dcb.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/hns3/hns3_dcb.c b/drivers/net/hns3/hns3_dcb.c index 1a156cca7e..89f8eda223 100644 --- a/drivers/net/hns3/hns3_dcb.c +++ b/drivers/net/hns3/hns3_dcb.c @@ -1511,5 +1511,4 @@ static int hns3_dcb_hw_configure(struct hns3_adapter *hns) { - struct rte_eth_dcb_rx_conf *dcb_rx_conf; struct hns3_pf *pf = &hns->pf; struct hns3_hw *hw = &hns->hw; @@ -1531,10 +1530,6 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns) if (hw->data->dev_conf.dcb_capability_en & RTE_ETH_DCB_PFC_SUPPORT) { - dcb_rx_conf = &hw->data->dev_conf.rx_adv_conf.dcb_rx_conf; - if (dcb_rx_conf->nb_tcs == 0) - hw->dcb_info.pfc_en = 1; /* tc0 only */ - else - hw->dcb_info.pfc_en = - RTE_LEN2MASK((uint8_t)dcb_rx_conf->nb_tcs, uint8_t); + hw->dcb_info.pfc_en = + RTE_LEN2MASK((uint8_t)HNS3_MAX_USER_PRIO, uint8_t); hw->dcb_info.hw_pfc_map = -- 2.44.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-04 10:49:33.799204264 +0100 +++ 0001-net-hns3-enable-PFC-for-all-user-priorities.patch 2024-04-04 10:49:33.687457571 +0100 @@ -1 +1 @@ -From aae6989df36c105b917cf69975c075dfde2e6b84 Mon Sep 17 00:00:00 2001 +From 5c731f2f53b8af0685f58c16dfe7fa1c9e1ab167 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit aae6989df36c105b917cf69975c075dfde2e6b84 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 2831d3dc62..915e4eb768 100644 +index 1a156cca7e..89f8eda223 100644 @@ -27 +28 @@ -@@ -1500,5 +1500,4 @@ static int +@@ -1511,5 +1511,4 @@ static int @@ -33 +34 @@ -@@ -1520,10 +1519,6 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns) +@@ -1531,10 +1530,6 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns)