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 C14C6A0A02 for ; Mon, 17 May 2021 18:15:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B8A21410F9; Mon, 17 May 2021 18:15:49 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 9E10940041 for ; Mon, 17 May 2021 18:15:48 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifuG-0008Ft-Eb; Mon, 17 May 2021 16:15:48 +0000 From: Christian Ehrhardt To: Huisong Li Cc: Min Hu , dpdk stable Date: Mon, 17 May 2021 18:09:22 +0200 Message-Id: <20210517161039.3132619-133-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: fix DCB mode check' has been queued to stable release 19.11.9 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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 05/19/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/b3d3d36f92d2dca0dbf1271cfb681c60f156c87b Thanks. Christian Ehrhardt --- >From b3d3d36f92d2dca0dbf1271cfb681c60f156c87b Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Sat, 17 Apr 2021 17:54:56 +0800 Subject: [PATCH] net/hns3: fix DCB mode check [ upstream commit edba2e32cbfd3747391031188c6a060ec8e70465 ] Currently, "ONLY DCB" and "DCB+RSS" mode are both supported by HNS3 PF driver. But the driver verifies only the "DCB+RSS" multiple queues mode. Fixes: 62e3ccc2b94c ("net/hns3: support flow control") Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 5b60d1d2cc..1a775eba65 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -2132,7 +2132,7 @@ hns3_check_mq_mode(struct rte_eth_dev *dev) return -EINVAL; } - if (rx_mq_mode == ETH_MQ_RX_DCB_RSS) { + if (rx_mq_mode & ETH_MQ_RX_DCB_FLAG) { if (dcb_rx_conf->nb_tcs > pf->tc_max) { hns3_err(hw, "nb_tcs(%u) > max_tc(%u) driver supported.", dcb_rx_conf->nb_tcs, pf->tc_max); -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:34.621757730 +0200 +++ 0133-net-hns3-fix-DCB-mode-check.patch 2021-05-17 17:40:29.391811209 +0200 @@ -1 +1 @@ -From edba2e32cbfd3747391031188c6a060ec8e70465 Mon Sep 17 00:00:00 2001 +From b3d3d36f92d2dca0dbf1271cfb681c60f156c87b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit edba2e32cbfd3747391031188c6a060ec8e70465 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index eb9a340e69..f5dfa47ac1 100644 +index 5b60d1d2cc..1a775eba65 100644 @@ -23 +24 @@ -@@ -2239,7 +2239,7 @@ hns3_check_mq_mode(struct rte_eth_dev *dev) +@@ -2132,7 +2132,7 @@ hns3_check_mq_mode(struct rte_eth_dev *dev)