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 DE18142CBC for ; Thu, 15 Jun 2023 03:34:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D83C842D44; Thu, 15 Jun 2023 03:34:29 +0200 (CEST) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id 743B440DDA for ; Thu, 15 Jun 2023 03:34:28 +0200 (CEST) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-3f8d86db375so14101295e9.1 for ; Wed, 14 Jun 2023 18:34:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686792868; x=1689384868; 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=sZSmbgsUIxp3T0qeQf+Q7rv4gUeVAKtVmoRUm9VOhzo=; b=KcjvrzN+/YtQh7ASs9N57MyX9+/cafXDXtdk8ibKU/QMoerKgfmP03808smVy9sszJ ta8EATldZMUTaWgA9YMHK0CTycoJcu4F+LCMKY9wTwcKNXB7W95/kHOROO48NmTcKn9h +DyfoIbRxir0wb7KHP0zCl8CEQTITcZ8pUcCR4G7VZfXitLvPTuDM40xdWfRcl798o6k n610tC//3CwQkPdYpmRQflwcB9z/SSiWdcCkYoO3ftR+QOyg9eh1/0oTffyurY2HYJCt k7rdmu62t2wdHQmhCskb4iRlC/kRIYMKgfT5TMqH7hxnnEy6upaBtAHGl50ek+DTeoHu vBsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686792868; x=1689384868; 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=sZSmbgsUIxp3T0qeQf+Q7rv4gUeVAKtVmoRUm9VOhzo=; b=iksAgK+QdrGqCvLKB0J2bn0FRID+4+sYBPop+/f/T0e1sxEgNJd/KyZHd0/bZjBi1L wkT7Goyy+1LXzaJNetKOqA7UfCixt0bN9UeA2sh2S6zsu3XzEoRyHRXAwAS7euUsD6Pd oxqss4cWRBWfUuMFkonHgmRz4HUVV4iZFSNCSzFhdrn29Z0Zgqf0Mf0USyIzGrXjPc5k y4JN0FQKwmbYDGBRiDAw4ivurWvvmXYapHJYP7HNE8qvNcwtUzCEizAxFooB92+UT8+6 H0ipCUfqZcXmzZPJWNwusqztUz//U4ZwC7BnF2uYNWLI8VbuOPij1s0z7vIGgzI+yxe0 38BQ== X-Gm-Message-State: AC+VfDzwFeY5c3CButXxbmfIE20ygf5UxQ+aMJkUFeklmqc+Oi7MSYWT 4mowHeqFGryXhs9cyxlbuFsM2v9pUqvdq5T0 X-Google-Smtp-Source: ACHHUZ6YQ9DWAEVl/DKaxOB1EDgBr+y6V7cSVi3rSCqI1bn1DmV9/Do/yrLrEYLfzkX8z3UPFoffLw== X-Received: by 2002:a05:600c:2285:b0:3f7:2a1d:1b05 with SMTP id 5-20020a05600c228500b003f72a1d1b05mr14320949wmf.14.1686792868107; Wed, 14 Jun 2023 18:34:28 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id e13-20020adfef0d000000b0030aeb3731d0sm19509718wro.98.2023.06.14.18.34.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 18:34:27 -0700 (PDT) From: luca.boccassi@gmail.com To: Jie Hai Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix FEC mode check' has been queued to stable release 20.11.9 Date: Thu, 15 Jun 2023 02:32:25 +0100 Message-Id: <20230615013258.1439718-30-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230615013258.1439718-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-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 20.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 06/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/511ebf2d683b28f3175b28b172b4ba4af39b2270 Thanks. Luca Boccassi --- >From 511ebf2d683b28f3175b28b172b4ba4af39b2270 Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Sat, 8 Apr 2023 10:27:34 +0800 Subject: [PATCH] net/hns3: fix FEC mode check [ upstream commit 0cf0f931267ae751c503dba929307bb2a6acbbfa ] The function is_fec_mode_one_bit_set() is used to check whether the binary of the mode from user only contains one '1'. But it uses the bytes number this mode variable occupied to calculate the count. So this patch uses __builtin_popcount() to replace it. This patch also extracts the code for verifying mode parameter into a function. Fixes: 9bf2ea8dbc65 ("net/hns3: support FEC") Signed-off-by: Jie Hai Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_ethdev.c | 51 ++++++++++++++++------------------ 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index c1b90ab025..5d685b17f4 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -6095,53 +6095,50 @@ get_current_speed_fec_cap(struct hns3_hw *hw, struct rte_eth_fec_capa *fec_capa) return cur_capa; } -static bool -is_fec_mode_one_bit_set(uint32_t mode) -{ - int cnt = 0; - uint8_t i; - - for (i = 0; i < sizeof(mode); i++) - if (mode >> i & 0x1) - cnt++; - - return cnt == 1 ? true : false; -} - static int -hns3_fec_set(struct rte_eth_dev *dev, uint32_t mode) +hns3_fec_mode_valid(struct rte_eth_dev *dev, uint32_t mode) { #define FEC_CAPA_NUM 2 struct hns3_adapter *hns = dev->data->dev_private; struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(hns); - struct hns3_pf *pf = &hns->pf; - struct rte_eth_fec_capa fec_capa[FEC_CAPA_NUM]; - uint32_t cur_capa; uint32_t num = FEC_CAPA_NUM; + uint32_t cur_capa; int ret; + if (__builtin_popcount(mode) != 1) { + hns3_err(hw, "FEC mode(0x%x) should be only one bit set", mode); + return -EINVAL; + } + ret = hns3_fec_get_capability(dev, fec_capa, num); if (ret < 0) return ret; - - /* HNS3 PMD only support one bit set mode, e.g. 0x1, 0x4 */ - if (!is_fec_mode_one_bit_set(mode)) { - hns3_err(hw, "FEC mode(0x%x) not supported in HNS3 PMD, " - "FEC mode should be only one bit set", mode); - return -EINVAL; - } - /* * Check whether the configured mode is within the FEC capability. * If not, the configured mode will not be supported. */ cur_capa = get_current_speed_fec_cap(hw, fec_capa); - if (!(cur_capa & mode)) { - hns3_err(hw, "unsupported FEC mode = 0x%x", mode); + if ((cur_capa & mode) == 0) { + hns3_err(hw, "unsupported FEC mode(0x%x)", mode); return -EINVAL; } + return 0; +} + +static int +hns3_fec_set(struct rte_eth_dev *dev, uint32_t mode) +{ + struct hns3_adapter *hns = dev->data->dev_private; + struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(hns); + struct hns3_pf *pf = &hns->pf; + int ret; + + ret = hns3_fec_mode_valid(dev, mode); + if (ret != 0) + return ret; + rte_spinlock_lock(&hw->lock); ret = hns3_set_fec_hw(hw, mode); if (ret) { -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-15 01:56:36.313822933 +0100 +++ 0030-net-hns3-fix-FEC-mode-check.patch 2023-06-15 01:56:34.599542003 +0100 @@ -1 +1 @@ -From 0cf0f931267ae751c503dba929307bb2a6acbbfa Mon Sep 17 00:00:00 2001 +From 511ebf2d683b28f3175b28b172b4ba4af39b2270 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0cf0f931267ae751c503dba929307bb2a6acbbfa ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -20,2 +21,2 @@ - drivers/net/hns3/hns3_ethdev.c | 50 ++++++++++++++++------------------ - 1 file changed, 24 insertions(+), 26 deletions(-) + drivers/net/hns3/hns3_ethdev.c | 51 ++++++++++++++++------------------ + 1 file changed, 24 insertions(+), 27 deletions(-) @@ -24 +25 @@ -index 94eadefb8e..4e8efa468d 100644 +index c1b90ab025..5d685b17f4 100644 @@ -27 +28 @@ -@@ -6139,52 +6139,50 @@ get_current_speed_fec_cap(struct hns3_hw *hw, struct rte_eth_fec_capa *fec_capa) +@@ -6095,53 +6095,50 @@ get_current_speed_fec_cap(struct hns3_hw *hw, struct rte_eth_fec_capa *fec_capa) @@ -51,0 +53 @@ +-