Update DPDK version from 19.11 to 20.11 and also support hns3 PMD for Kunpeng 920 and Kunpeng 930. Signed-off-by: speech_white <humin29@huawei.com>
84 lines
2.9 KiB
Diff
84 lines
2.9 KiB
Diff
From 4a924045f23a81a07b59233f7bc12c1e38daa234 Mon Sep 17 00:00:00 2001
|
|
From: Chengwen Feng <fengchengwen@huawei.com>
|
|
Date: Fri, 30 Apr 2021 17:04:03 +0800
|
|
Subject: [PATCH 153/189] net/hns3: remove unused VMDq code
|
|
|
|
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")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
|
|
Signed-off-by: Min Hu (Connor) <humin29@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 ac74e4d..a249a7a 100644
|
|
--- a/drivers/net/hns3/hns3_cmd.h
|
|
+++ b/drivers/net/hns3/hns3_cmd.h
|
|
@@ -457,8 +457,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 f5160ed..44e6c5b 100644
|
|
--- a/drivers/net/hns3/hns3_ethdev.c
|
|
+++ b/drivers/net/hns3/hns3_ethdev.c
|
|
@@ -2791,8 +2791,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;
|
|
@@ -3072,8 +3070,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 c70950a..53dc498 100644
|
|
--- a/drivers/net/hns3/hns3_ethdev.h
|
|
+++ b/drivers/net/hns3/hns3_ethdev.h
|
|
@@ -155,7 +155,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 f4d2a9f..c4419fb 100644
|
|
--- a/drivers/net/hns3/hns3_ethdev_vf.c
|
|
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
|
|
@@ -1022,8 +1022,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.7.4
|
|
|