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 2119BA0C3F for ; Sat, 12 Jun 2021 01:17:02 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1AED640DDB; Sat, 12 Jun 2021 01:17:02 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam08on2069.outbound.protection.outlook.com [40.107.101.69]) by mails.dpdk.org (Postfix) with ESMTP id 0714F406A2 for ; Sat, 12 Jun 2021 01:17:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=klLSIPrcgiGUdUloe1e9hxVAyZ3Q0vNTZll7Hb87UrFpMeN9kadIGULM5HNY4ZK3dX5Ygm09Zq/5eNLLlV6zxxZqg6a2b8ulesUlHPJMICZM4YWI8cXIVomMhXi9wpu5ozWBueQMK+4lo/fyZaKUV5Fdep1225xvdorgonwGU/qooUCYbRi5m5HStBEHGBPNpBZ8Tl2zazYWk2zEIDdf4QjCTgzBw9eFs+00S2+r7ZmTtgb9rtDPUlEadY/KCfgxopc+h75ajtow1zOYXDoxES0kaK/1iCtbf2NLAv3gEeRtdm41rypoeKMkIc89Y9L0E89lDQyIrAx+5oaBQY84PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l2UIeNEdlivtAslzZSDv1vW77Nfo1e6+RJ0bOpY19YM=; b=esg6eVJkguV3kINY/Juai1yDAhAnNXfUjRwVihPzkNBWLw8Y9ceXIOQVfIFEtxrKtdzNip4YSuEEWS7RAqCOoB6bn+6PQVOBZexhLQhQBdeVWj+bNvYUA3wjm2vgmo9KRKWXPLVy7sxtwJAcsKI61UhQz6or236hSgaAfPPckMgFFMlTN+6UezQ7u35xzu6YM9N65iAVYzHn7PD5hQIz+45YtYQwIPebIv9cJZYFWuGpA1bnaj6ecCxDRNaRJ/l3clRM+2IcM9yV4ogcTrHTEq9sAYeg8Idg4SHwb5YVivbEi2/WjLGn2GOaHvN6pq1NP2Oq5Ub2zXG/PBKAfVRU8w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l2UIeNEdlivtAslzZSDv1vW77Nfo1e6+RJ0bOpY19YM=; b=I0DW9X4oinG/KBIBkglEUdy/LQvDrH0AgKWChBgQmvcrTVrFeX5hXpABA2ZtmTMz5s0ORdQktBgl+1BJ4hga9p5CW3RMrTlkoPW3n4yx1gIXAF7JRf8Fyy4DaX9LcCAI7A8TNNLWA3kKQWsoXQYVqTh3iiuJjQB3H13Zzr+hnUhmL2OaWXn8YWIlo28spGZ5HHNJmej1jFJbK+HV1HpYi4/FWDyRkvzOPo0n95tiKhRRpFnLaO+9ckJoA+ZF+5neErZnH6dCVOYrNyER7ruzhqDmbnhLSrmlDwnlRTSs06BQO/EUtyYXha/p/OzdeySgiWDj9dn6AWxFE+l6lpT4Bg== Received: from BN9PR03CA0069.namprd03.prod.outlook.com (2603:10b6:408:fc::14) by CY4PR12MB1159.namprd12.prod.outlook.com (2603:10b6:903:36::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.23; Fri, 11 Jun 2021 23:16:59 +0000 Received: from BN8NAM11FT017.eop-nam11.prod.protection.outlook.com (2603:10b6:408:fc:cafe::eb) by BN9PR03CA0069.outlook.office365.com (2603:10b6:408:fc::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Fri, 11 Jun 2021 23:16:59 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; huawei.com; dkim=none (message not signed) header.d=none;huawei.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT017.mail.protection.outlook.com (10.13.177.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:16:58 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:16:56 +0000 From: Xueming Li To: Chengwen Feng CC: Luca Boccassi , Min Hu , dpdk stable Date: Sat, 12 Jun 2021 07:03:42 +0800 Message-ID: <20210611230433.8208-128-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 741a6c2c-dbae-4eb6-07a9-08d92d2f032b X-MS-TrafficTypeDiagnostic: CY4PR12MB1159: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EZPN+dg+R4523iX/0hEa1kteOtM2N4Gv4mwbjG3pU69N28yL9FFDMd8oxQiF2TYmD7xwHgXCqIjK8usJOCwcfLXPUrqSZZE/YATOH1rhdpEGXJf9ES6PnzX2rSvl4QJPwS+wI+CE265iz/0UwjX2xCHOE6Pg9jE4fysuc8sKg4/8qMgwMirurC7FF9uziBvygKQ+MvamLOOVbEOKBkYBXwxqt5wBDBxjTmqbsp9Pius0q8yRZRhCkjT2KC8+SeR+b9ZjZ0OM5QbAdDTIViEUkRhf0H/pr93LEi5ij4T2AAxK5UhwsHFnuRB7kd9rwYBTmXNUJGWUX/zNdhcOImgjxZr/1lGs97aqDBZuEbe7XjZy6JaHq2G2bcAd+CnzvQsH5VW1AT0XLVEupVUHTTNvvk5CQjBk9hCnI7bGiwYVQtSWr3iUp7CFsxNSjO1TPNVVqiab0MpNy3mG38Z61NUI+YE0m3b5vkiAnWvp35DOuEXQrsLhw1FJAwu2CLrS9lLjrtQxkJ09nWwtK8oGn6C1gcYdr6SxzEWxQ8VP9+z4+M9pm9wE5KP0xOyMGzreb4Z8Ce+/xbwHSEV6POVlJ5cU0EtZhAGLfx1Jvmb8oj9+PoSIiEypaK+miTbzTngoHc1yz2xdhXr8SZk60PF0lafDMhFJaW4D7BB1p/g52G8ssqAH9XUY2vwVXeToA6QDFxGroYt/5mZwbP4O5W9SagO6phSuO9TQChLoy5r9y9aWMVPqbLYKYm+xufE4Ta+OP91BgU+6MWkWQGRafDlQiAmK7RUh8rTxr148GvKPC4cCoLcKlqEJW6tSbv5Gvaefi4Mr X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(396003)(39860400002)(376002)(346002)(136003)(36840700001)(46966006)(8936002)(70206006)(8676002)(36906005)(26005)(7636003)(16526019)(82310400003)(6916009)(70586007)(36860700001)(55016002)(1076003)(4326008)(316002)(356005)(47076005)(186003)(478600001)(83380400001)(2616005)(336012)(966005)(2906002)(6286002)(82740400003)(54906003)(7696005)(426003)(5660300002)(6666004)(36756003)(86362001)(53546011); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:16:58.7741 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 741a6c2c-dbae-4eb6-07a9-08d92d2f032b X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT017.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1159 Subject: [dpdk-stable] patch 'net/hns3: fail setting FEC if one bit mode is not supported' has been queued to stable release 20.11.2 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 20.11.2 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/14/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/98f23aad5647198c35f83767641f24fbc39b861d Thanks. Xueming Li --- >From 98f23aad5647198c35f83767641f24fbc39b861d Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Mon, 10 May 2021 21:38:13 +0800 Subject: [PATCH] net/hns3: fail setting FEC if one bit mode is not supported Cc: Luca Boccassi [ upstream commit ab8c5005853ac4f77b645396ce681fb6ea2bb5e9 ] If the FEC mode was not supported, it should return error code. This patch also adds a space when log error info. Fixes: 9bf2ea8dbc65 ("net/hns3: support FEC") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_ethdev.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 498e1a40f3..5716e399c9 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -6121,9 +6121,11 @@ hns3_fec_set(struct rte_eth_dev *dev, uint32_t mode) return ret; /* HNS3 PMD driver 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," + 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. -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:59.859901800 +0800 +++ 0128-net-hns3-fail-setting-FEC-if-one-bit-mode-is-not-sup.patch 2021-06-12 06:53:56.540000000 +0800 @@ -1 +1 @@ -From ab8c5005853ac4f77b645396ce681fb6ea2bb5e9 Mon Sep 17 00:00:00 2001 +From 98f23aad5647198c35f83767641f24fbc39b861d Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit ab8c5005853ac4f77b645396ce681fb6ea2bb5e9 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index b8e97355e9..0589e3f10a 100644 +index 498e1a40f3..5716e399c9 100644 @@ -23 +25 @@ -@@ -6991,9 +6991,11 @@ hns3_fec_set(struct rte_eth_dev *dev, uint32_t mode) +@@ -6121,9 +6121,11 @@ hns3_fec_set(struct rte_eth_dev *dev, uint32_t mode)