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 4CA7FA0C3F for ; Sat, 12 Jun 2021 01:10:55 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 445FB4003F; Sat, 12 Jun 2021 01:10:55 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2082.outbound.protection.outlook.com [40.107.92.82]) by mails.dpdk.org (Postfix) with ESMTP id 0B25A40691 for ; Sat, 12 Jun 2021 01:10:54 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aPQIg1y2/L7OpZg3RIm0RW6VtMM/1Mq1NawTA+RPZL4+H9Ccp3P9EWA1fT8tXbcLYiuP39OClW9qBsU8jmBAJTv8KjsVl6E5LJBqOg34ETXAfSkAkBZdRrJ0dZx07RfcnsqM6bPfoFnRCQzXCQuDYvKsJzE/DDEMhFN0aI7pqaKIeoKP3twZHsHYB1yo1LRNyUWejS/RlwGO7IX+p5GH79wuDnVppWyzxkm5sCXeKQ1CO1f2NuuU0lPWEABrl1QJfr6QBdppP4YpmFMIOX5+reQeJUU/MCprkbP0w0vvn8D8sFPwnEDhUHfEHOaJVI5kZOZPmQ3Lv6kn8StHslZ/Vw== 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=JovdAJc/YHUXnPyJzVZoO6CYABSak9+KNrVriWtl+aY=; b=RajW7VDLKpICV4zXnaaR8uVOhTnlfu6RNe3WboF6d3QtT7G8ROo7xTEr/+UNFy2to3f+e616dZDYKm5M1kfSbBH56WwnZRcqauQY7gZbW8WDR9V+WH8k+y4TRqztDovzHR86L0eNc5Spjsk5IdajnYE5woZ2BY8izfkG1mV/bGdocZxTSbgVqME4gJ3e682z145cg3ISixG2/VCqdHI3F3wdTaKizjsTSuwdob5VWc+KIMVu4qy1vpHiEpBQEifYxUi6N28F2oTHCIPHS+8hDZe0ty+POLaWERg4z21M7aYhHG9cgGcgL7XRz4nNwGwT0hvI2HRrX0iQq8qpWZLR+Q== 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=JovdAJc/YHUXnPyJzVZoO6CYABSak9+KNrVriWtl+aY=; b=n3O9Dre4+7YeIQXjqBB/RpU/FA2Xde8+Zq9/mWXAmaAezXKQ8Ypqi2spgzJyq8H/H0PRaUTnueMvpmRwEmJ4cXOKyPe3koc5DBhMkxSdtRgrPcR+mQZRHcY0WWMneMD9u7sPvQpgNxzN2H9Q84YR3e927TBqNOEnfvxwmSg+r7gF6DPIXvAfWjTwKLYsjjwCX+U/GCaBIzv9i1CwQa+6NwFp3kKgi6dmKjFLuYn0cMGp2WFzq7lehqrJRRXImZwKAMX/Q8c8ISsJwbv74IVoqETMB/4wtDHPzCM2Aui08fxQZ1oML8H2DgGqphFowp5z3omBlGB63DMMzBpMSBpdYw== Received: from MW4PR04CA0010.namprd04.prod.outlook.com (2603:10b6:303:69::15) by BYAPR12MB2776.namprd12.prod.outlook.com (2603:10b6:a03:67::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.23; Fri, 11 Jun 2021 23:10:52 +0000 Received: from CO1NAM11FT050.eop-nam11.prod.protection.outlook.com (2603:10b6:303:69:cafe::24) by MW4PR04CA0010.outlook.office365.com (2603:10b6:303:69::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:10:52 +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 CO1NAM11FT050.mail.protection.outlook.com (10.13.174.79) 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:10:51 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:10:49 +0000 From: Xueming Li To: Chengwen Feng CC: Luca Boccassi , Min Hu , dpdk stable Date: Sat, 12 Jun 2021 07:02:39 +0800 Message-ID: <20210611230433.8208-65-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.6] 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: 8994ab86-f21d-4f4e-27dc-08d92d2e284b X-MS-TrafficTypeDiagnostic: BYAPR12MB2776: 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: HIdMQzvH6OAEsLjSRuLGiXwnGJwwVTaaop+OindxEHnZohUXk94gix6KmSg7qWqH84pFWc0Q5IP2QOSOzy8zA7LjrV+wsGIrmB8v0Kpz3a5bKNPDe9dH1RFLHtpWGZmzbQaG2EXnEfnarlwt68W3LjrpH8xhX+Qnd3fwiyneI5zrft49DA4qzr+fgGIfSWF0AQntfQSnFv+uXpgxXFd3BG2ae7pKvpkETIaAGewRQMZfVwDw2vT6EOVu4SjyJgtvE/BIudHT2v2AIXGWBgGPqtNQbfVrHk52b3tXQg6hqp8zFAmbPJ+FKnEAusWUF1C18uai+ArNOCBysTLbOGRYBRhrnIGq1s5t6hBhtPny1h56wiNa9DQw4MeCNCCiUh4+NUXAiCoh/opQSk6zQl0fvzhYczMIPRFJpMmE1zpmnlcNQmc7fbQsE7xx6QKo9Gk1cs97rQOUMZmal3beONNWvvIQd/X0gIFymsNBX/oqg8EHH8atLoGGFUiFanVK/KJi8YuyxoAKoJRyHcRxX2rqFr/XyL/Irl8OrsRCIFIhLqAXRx3kBLss2iKO9WOEnR4yai+SjTcoMT7OEq+e5+8237SiTNmskYFlg5Jw0ZZErK5lnNTec3qOKI+KTGcSakaT4vhBHnbu4CTqaVbPO3v0ZGrgr6MA3NPasxXJU0m+DaNZZoygGfJ1tdKaUOALo5GiN39CCn5kFykLpbpwck2Ra9HNFTasOtQliVvrY3GtiVCONQY1xoOCTM+Dj2PN98xkb/6TQZwVqinbDTnUMmYNLvAufvYPjvo/p3IVmwbYnDnDcVIeLn8lEonazZ8dDl07 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)(136003)(39860400002)(376002)(346002)(396003)(36840700001)(46966006)(316002)(6916009)(54906003)(16526019)(966005)(26005)(186003)(2616005)(70586007)(8676002)(356005)(478600001)(70206006)(4326008)(82310400003)(2906002)(53546011)(36756003)(7696005)(426003)(86362001)(36860700001)(82740400003)(5660300002)(55016002)(1076003)(6666004)(6286002)(8936002)(83380400001)(36906005)(7636003)(336012)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:10:51.6296 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8994ab86-f21d-4f4e-27dc-08d92d2e284b 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: CO1NAM11FT050.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2776 Subject: [dpdk-stable] patch 'net/hns3: remove unused VMDq code' 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/ce498169d471c6175a74d33b6aed30cf320e2486 Thanks. Xueming Li --- >From ce498169d471c6175a74d33b6aed30cf320e2486 Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Fri, 30 Apr 2021 17:04:03 +0800 Subject: [PATCH] net/hns3: remove unused VMDq code Cc: Luca Boccassi [ upstream commit cdf3e4f3000fb26aa219e46315e75c0fa392cb70 ] VMDq is not supported yet, so remove the unused code. Fixes: d51867db65c1 ("net/hns3: add initialization") Fixes: 1265b5372d9d ("net/hns3: add some definitions for data structure and macro") Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_cmd.h | 2 -- drivers/net/hns3/hns3_ethdev.c | 4 ---- drivers/net/hns3/hns3_ethdev.h | 1 - drivers/net/hns3/hns3_ethdev_vf.c | 2 -- 4 files changed, 9 deletions(-) diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h index 37cb20a9f5..041f2fa789 100644 --- a/drivers/net/hns3/hns3_cmd.h +++ b/drivers/net/hns3/hns3_cmd.h @@ -425,8 +425,6 @@ struct hns3_umv_spc_alc_cmd { #define HNS3_CFG_RD_LEN_BYTES 16 #define HNS3_CFG_RD_LEN_UNIT 4 -#define HNS3_CFG_VMDQ_S 0 -#define HNS3_CFG_VMDQ_M GENMASK(7, 0) #define HNS3_CFG_TC_NUM_S 8 #define HNS3_CFG_TC_NUM_M GENMASK(15, 8) #define HNS3_CFG_TQP_DESC_N_S 16 diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 907435c677..498e1a40f3 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -2613,8 +2613,6 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) .offloads = 0, }; - info->vmdq_queue_num = 0; - info->reta_size = hw->rss_ind_tbl_size; info->hash_key_size = HNS3_RSS_KEY_SIZE; info->flow_type_rss_offloads = HNS3_ETH_RSS_SUPPORT; @@ -2882,8 +2880,6 @@ hns3_parse_cfg(struct hns3_cfg *cfg, struct hns3_cmd_desc *desc) req = (struct hns3_cfg_param_cmd *)desc[0].data; /* get the configuration */ - cfg->vmdq_vport_num = hns3_get_field(rte_le_to_cpu_32(req->param[0]), - HNS3_CFG_VMDQ_M, HNS3_CFG_VMDQ_S); cfg->tc_num = hns3_get_field(rte_le_to_cpu_32(req->param[0]), HNS3_CFG_TC_NUM_M, HNS3_CFG_TC_NUM_S); cfg->tqp_desc_num = hns3_get_field(rte_le_to_cpu_32(req->param[0]), diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h index 3032af6f55..79a96bdd08 100644 --- a/drivers/net/hns3/hns3_ethdev.h +++ b/drivers/net/hns3/hns3_ethdev.h @@ -148,7 +148,6 @@ struct hns3_tc_queue_info { }; struct hns3_cfg { - uint8_t vmdq_vport_num; uint8_t tc_num; uint16_t tqp_desc_num; uint16_t rx_buf_len; diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index 8ad02a0b11..7f83e85203 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -1027,8 +1027,6 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) .offloads = 0, }; - info->vmdq_queue_num = 0; - info->reta_size = hw->rss_ind_tbl_size; info->hash_key_size = HNS3_RSS_KEY_SIZE; info->flow_type_rss_offloads = HNS3_ETH_RSS_SUPPORT; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:58.304704900 +0800 +++ 0065-net-hns3-remove-unused-VMDq-code.patch 2021-06-12 06:53:56.310000000 +0800 @@ -1 +1 @@ -From cdf3e4f3000fb26aa219e46315e75c0fa392cb70 Mon Sep 17 00:00:00 2001 +From ce498169d471c6175a74d33b6aed30cf320e2486 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit cdf3e4f3000fb26aa219e46315e75c0fa392cb70 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 944e3d6d4c..eafa365a1f 100644 +index 37cb20a9f5..041f2fa789 100644 @@ -25 +27 @@ -@@ -457,8 +457,6 @@ struct hns3_umv_spc_alc_cmd { +@@ -425,8 +425,6 @@ struct hns3_umv_spc_alc_cmd { @@ -35 +37 @@ -index c554d2adfc..2056a37c7d 100644 +index 907435c677..498e1a40f3 100644 @@ -38 +40 @@ -@@ -2791,8 +2791,6 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) +@@ -2613,8 +2613,6 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) @@ -47 +49 @@ -@@ -3075,8 +3073,6 @@ hns3_parse_cfg(struct hns3_cfg *cfg, struct hns3_cmd_desc *desc) +@@ -2882,8 +2880,6 @@ hns3_parse_cfg(struct hns3_cfg *cfg, struct hns3_cmd_desc *desc) @@ -57 +59 @@ -index 133b484dd4..1714ebaaf5 100644 +index 3032af6f55..79a96bdd08 100644 @@ -60 +62 @@ -@@ -155,7 +155,6 @@ struct hns3_tc_queue_info { +@@ -148,7 +148,6 @@ struct hns3_tc_queue_info { @@ -69 +71 @@ -index 9a85e970ce..6aa8a9b6ed 100644 +index 8ad02a0b11..7f83e85203 100644 @@ -72 +74 @@ -@@ -1022,8 +1022,6 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) +@@ -1027,8 +1027,6 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)