[dpdk-stable] patch 'net/hns3: remove unused VMDq code' has been queued to stable release 19.11.9

[Christian Ehrhardt]

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/9664220cb6df3185b98d35088a77f3dd830ac91e

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 9664220cb6df3185b98d35088a77f3dd830ac91e Mon Sep 17 00:00:00 2001
From: Chengwen Feng <fengchengwen at huawei.com>
Date: Fri, 30 Apr 2021 17:04:03 +0800
Subject: [PATCH] net/hns3: remove unused VMDq code

[ 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 <fengchengwen at huawei.com>
Signed-off-by: Min Hu (Connor) <humin29 at huawei.com>
---
 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 9c3c68c3e2..07ea1484b3 100644
--- a/drivers/net/hns3/hns3_cmd.h
+++ b/drivers/net/hns3/hns3_cmd.h
@@ -381,8 +381,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 87244b9bac..3a799ed4f8 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2543,8 +2543,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 = HNS3_RSS_IND_TBL_SIZE;
 	info->hash_key_size = HNS3_RSS_KEY_SIZE;
 	info->flow_type_rss_offloads = HNS3_ETH_RSS_SUPPORT;
@@ -2718,8 +2716,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 9675c675d5..a69d470b04 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -121,7 +121,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 f53a834fcc..6de4078f5c 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -886,8 +886,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 = HNS3_RSS_IND_TBL_SIZE;
 	info->hash_key_size = HNS3_RSS_KEY_SIZE;
 	info->flow_type_rss_offloads = HNS3_ETH_RSS_SUPPORT;
-- 
2.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-17 17:40:36.707199980 +0200
+++ 0187-net-hns3-remove-unused-VMDq-code.patch	2021-05-17 17:40:29.543812406 +0200
@@ -1 +1 @@
-From cdf3e4f3000fb26aa219e46315e75c0fa392cb70 Mon Sep 17 00:00:00 2001
+From 9664220cb6df3185b98d35088a77f3dd830ac91e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cdf3e4f3000fb26aa219e46315e75c0fa392cb70 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index 944e3d6d4c..eafa365a1f 100644
+index 9c3c68c3e2..07ea1484b3 100644
@@ -25 +26 @@
-@@ -457,8 +457,6 @@ struct hns3_umv_spc_alc_cmd {
+@@ -381,8 +381,6 @@ struct hns3_umv_spc_alc_cmd {
@@ -35 +36 @@
-index c554d2adfc..2056a37c7d 100644
+index 87244b9bac..3a799ed4f8 100644
@@ -38 +39 @@
-@@ -2791,8 +2791,6 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)
+@@ -2543,8 +2543,6 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)
@@ -44 +45 @@
- 	info->reta_size = hw->rss_ind_tbl_size;
+ 	info->reta_size = HNS3_RSS_IND_TBL_SIZE;
@@ -47 +48 @@
-@@ -3075,8 +3073,6 @@ hns3_parse_cfg(struct hns3_cfg *cfg, struct hns3_cmd_desc *desc)
+@@ -2718,8 +2716,6 @@ hns3_parse_cfg(struct hns3_cfg *cfg, struct hns3_cmd_desc *desc)
@@ -57 +58 @@
-index 133b484dd4..1714ebaaf5 100644
+index 9675c675d5..a69d470b04 100644
@@ -60 +61 @@
-@@ -155,7 +155,6 @@ struct hns3_tc_queue_info {
+@@ -121,7 +121,6 @@ struct hns3_tc_queue_info {
@@ -69 +70 @@
-index 9a85e970ce..6aa8a9b6ed 100644
+index f53a834fcc..6de4078f5c 100644
@@ -72 +73 @@
-@@ -1022,8 +1022,6 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)
+@@ -886,8 +886,6 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)
@@ -78 +79 @@
- 	info->reta_size = hw->rss_ind_tbl_size;
+ 	info->reta_size = HNS3_RSS_IND_TBL_SIZE;