From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2084EA00E6 for ; Wed, 10 Jul 2019 06:14:06 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B26CB1B998; Wed, 10 Jul 2019 06:14:05 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 2B45C1B96E; Wed, 10 Jul 2019 06:14:01 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Jul 2019 21:14:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,473,1557212400"; d="scan'208";a="167610131" Received: from dpdk51.sh.intel.com ([10.67.110.245]) by fmsmga007.fm.intel.com with ESMTP; 09 Jul 2019 21:13:59 -0700 From: Qi Zhang To: qiming.yang@intel.com, wenzhuo.lu@intel.com Cc: dev@dpdk.org, Qi Zhang , stable@dpdk.org Date: Wed, 10 Jul 2019 12:16:29 +0800 Message-Id: <20190710041630.47927-1-qi.z.zhang@intel.com> X-Mailer: git-send-email 2.13.6 Subject: [dpdk-stable] [PATCH v3 1/2] net/ice: remove unused devargs X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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" 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 --- doc/guides/nics/ice.rst | 8 ------ drivers/net/ice/ice_ethdev.c | 66 ++------------------------------------------ 2 files changed, 3 insertions(+), 71 deletions(-) diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst index 666b1b272..e9b3a48bc 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 9ce730cd4..4b5cd8269 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" @@ -251,59 +250,6 @@ ice_init_controlq_parameter(struct ice_hw *hw) } 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; @@ -3751,8 +3693,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 "="); RTE_INIT(ice_init_log) { -- 2.13.6