From: Qi Zhang <qi.z.zhang@intel.com>
Date: Wed, 10 Jul 2019 04:16:29 +0000 (+0800)
Subject: net/ice: remove unused devargs
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=e732b7f5393f4b8225ab460c58dafb858a38a52c;p=dpdk.git

net/ice: remove unused devargs

Remove devarg "max_queue_pair_num" related code since
it is not complete implemented.

Fixes: f9cf4f864150 ("net/ice: support device initialization")
Cc: stable@dpdk.org

Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Qiming Yang <qiming.yang@intel.com>
---

diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst
index 666b1b272b..e9b3a48bcb 100644
--- a/doc/guides/nics/ice.rst
+++ b/doc/guides/nics/ice.rst
@@ -49,14 +49,6 @@ Please note that enabling debugging options may affect system performance.
 Runtime Config Options
 ~~~~~~~~~~~~~~~~~~~~~~
 
-- ``Maximum Number of Queue Pairs``
-
-  The maximum number of queue pairs is decided by HW. If not configured, APP
-  uses the number from HW. Users can check the number by calling the API
-  ``rte_eth_dev_info_get``.
-  If users want to limit the number of queues, they can set a smaller number
-  using EAL parameter like ``max_queue_pair_num=n``.
-
 
 Driver compilation and testing
 ------------------------------
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 2ddf9d3bea..4190824ae0 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -17,7 +17,6 @@
 #include "ice_rxtx.h"
 #include "ice_switch_filter.h"
 
-#define ICE_MAX_QP_NUM "max_queue_pair_num"
 #define ICE_DFLT_OUTER_TAG_TYPE ICE_AQ_VSI_OUTER_TAG_VLAN_9100
 #define ICE_DFLT_PKG_FILE "/lib/firmware/intel/ice/ddp/ice.pkg"
 
@@ -250,59 +249,6 @@ ice_init_controlq_parameter(struct ice_hw *hw)
 	hw->mailboxq.sq_buf_size = ICE_MAILBOXQ_BUF_SZ;
 }
 
-static int
-ice_check_qp_num(const char *key, const char *qp_value,
-		 __rte_unused void *opaque)
-{
-	char *end = NULL;
-	int num = 0;
-
-	while (isblank(*qp_value))
-		qp_value++;
-
-	num = strtoul(qp_value, &end, 10);
-
-	if (!num || (*end == '-') || errno) {
-		PMD_DRV_LOG(WARNING, "invalid value:\"%s\" for key:\"%s\", "
-			    "value must be > 0",
-			    qp_value, key);
-		return -1;
-	}
-
-	return num;
-}
-
-static int
-ice_config_max_queue_pair_num(struct rte_devargs *devargs)
-{
-	struct rte_kvargs *kvlist;
-	const char *queue_num_key = ICE_MAX_QP_NUM;
-	int ret;
-
-	if (!devargs)
-		return 0;
-
-	kvlist = rte_kvargs_parse(devargs->args, NULL);
-	if (!kvlist)
-		return 0;
-
-	if (!rte_kvargs_count(kvlist, queue_num_key)) {
-		rte_kvargs_free(kvlist);
-		return 0;
-	}
-
-	if (rte_kvargs_process(kvlist, queue_num_key,
-			       ice_check_qp_num, NULL) < 0) {
-		rte_kvargs_free(kvlist);
-		return 0;
-	}
-	ret = rte_kvargs_process(kvlist, queue_num_key,
-				 ice_check_qp_num, NULL);
-	rte_kvargs_free(kvlist);
-
-	return ret;
-}
-
 static int
 ice_res_pool_init(struct ice_res_pool_info *pool, uint32_t base,
 		  uint32_t num)
@@ -1128,13 +1074,9 @@ ice_pf_sw_init(struct rte_eth_dev *dev)
 	struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
 	struct ice_hw *hw = ICE_PF_TO_HW(pf);
 
-	if (ice_config_max_queue_pair_num(dev->device->devargs) > 0)
-		pf->lan_nb_qp_max =
-			ice_config_max_queue_pair_num(dev->device->devargs);
-	else
-		pf->lan_nb_qp_max =
-			(uint16_t)RTE_MIN(hw->func_caps.common_cap.num_txq,
-					  hw->func_caps.common_cap.num_rxq);
+	pf->lan_nb_qp_max =
+		(uint16_t)RTE_MIN(hw->func_caps.common_cap.num_txq,
+				  hw->func_caps.common_cap.num_rxq);
 
 	pf->lan_nb_qps = pf->lan_nb_qp_max;
 
@@ -3750,8 +3692,6 @@ static struct rte_pci_driver rte_ice_pmd = {
 RTE_PMD_REGISTER_PCI(net_ice, rte_ice_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_ice, pci_id_ice_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_ice, "* igb_uio | uio_pci_generic | vfio-pci");
-RTE_PMD_REGISTER_PARAM_STRING(net_ice,
-			      ICE_MAX_QP_NUM "=<int>");
 
 RTE_INIT(ice_init_log)
 {