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 9A3CD42ECF for ; Thu, 20 Jul 2023 17:22:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 956E840685; Thu, 20 Jul 2023 17:22:55 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 689A1400D6 for ; Thu, 20 Jul 2023 17:22:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866573; 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=EZPZOIL46Dk3NpBK/OuGAfdoALgZdzx/1VzgQT25+xU=; b=Wv0+z9wqwwmRw4REFV3vlY2yvQtlB1cfD3UFT+FoqltahyRFMjnRYkD2M1RymBczJP7NmY 3WlHr9mlpqUZIEO7XVfS9n10KKFfhGjUDx6jwMneGGObyDiOvJwU12jqez+bFuu4JEeRvq bJ3dDyA156dX3UMkwa0YL+145ANKwkU= 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-562-s5Lbj1cSMDSZhjOjHjzcqg-1; Thu, 20 Jul 2023 11:21:13 -0400 X-MC-Unique: s5Lbj1cSMDSZhjOjHjzcqg-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 DF8A629AA2E7; Thu, 20 Jul 2023 15:20:50 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id D5D154CD0E1; Thu, 20 Jul 2023 15:20:49 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix FEC mode check' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:17:47 +0100 Message-ID: <20230720151942.262154-36-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/65193aced092c035dfc6bac37069f5474f62f08e Thanks. Kevin --- >From 65193aced092c035dfc6bac37069f5474f62f08e 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 f812926738..c70cf12b01 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -6198,41 +6198,23 @@ get_current_speed_fec_cap(struct hns3_hw *hw, struct rte_eth_fec_capa *fec_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. @@ -6240,9 +6222,24 @@ hns3_fec_set(struct rte_eth_dev *dev, uint32_t mode) */ 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); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:17:59.436038642 +0100 +++ 0036-net-hns3-fix-FEC-mode-check.patch 2023-07-20 16:17:54.607750287 +0100 @@ -1 +1 @@ -From 0cf0f931267ae751c503dba929307bb2a6acbbfa Mon Sep 17 00:00:00 2001 +From 65193aced092c035dfc6bac37069f5474f62f08e 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 f812926738..c70cf12b01 100644 @@ -27 +28 @@ -@@ -6140,40 +6140,23 @@ get_current_speed_fec_cap(struct hns3_hw *hw, struct rte_eth_fec_capa *fec_capa) +@@ -6198,41 +6198,23 @@ get_current_speed_fec_cap(struct hns3_hw *hw, struct rte_eth_fec_capa *fec_capa) @@ -50,0 +52 @@ +- @@ -75 +77 @@ -@@ -6181,9 +6164,24 @@ hns3_fec_set(struct rte_eth_dev *dev, uint32_t mode) +@@ -6240,9 +6222,24 @@ hns3_fec_set(struct rte_eth_dev *dev, uint32_t mode)