From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com [209.85.217.170]) by dpdk.org (Postfix) with ESMTP id BFE0DC31C for ; Wed, 22 Jun 2016 11:06:13 +0200 (CEST) Received: by mail-lb0-f170.google.com with SMTP id o4so18468789lbp.2 for ; Wed, 22 Jun 2016 02:06:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nZtc2/hgEjaFIMVqw41Jq++YC5FG4WQREfVAeAwhzU8=; b=lGMRfajVC86rRF68nihuOxrzLPnrASaaFfdk/XwCT8zxlX3VaiaS+b7yZ5hUObqmBY VhXGCFY6LgQaNFf0fh2sXYy6Xeo0Xu6r/2Qfq7ZaCQ+omzEFMCD9ifmtwn2OEOvDfNDN yciabOv3502zOaMgiY8WN99+jH+VFYyvDstEuVSgw2rbhBERRvG6Lx0GjbI+Wgp5DSrM d9tn1kp1kzUfRLtKuGp0S2/NZEMFITz0xTy9mzYDevKzDhBD/33+Q5hozXL0TAyh4dPb UFI+cQ52TsVrT8gaVVa2grfbi/YFWHjvIG9jVgWsmki6UK5pcVYy/cdHJlIXpCCpI5hH 9AuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nZtc2/hgEjaFIMVqw41Jq++YC5FG4WQREfVAeAwhzU8=; b=amRiPJlIh1oOBG1B9QVSXbZunq8pfScJvgDeNEO1IFAl72iyukh95veZURkytVlu2T oZe7w7kTmpwZOgO20QIWZ8ahCjDPme1dCtuSjeDr+BNL5b7Ke/tl0w7DVkngayLHgk0S qSB5LkV+tyr7ukBB3GidnuSlzuJnI6CXx5OsdOudUDXF/fE20H412VW271aSpq5qasq8 iK7+3Zj4fNLVrcdNT4wjnAudQswLv4fC0M61Xsjj8jAR9gzOoVGg2c52I5Dzn+oXBXTV eunXXuuwJLxSgfBFsAuoQzcVV/VAx/QA0Ww79gcI6Ih9h9QfO/aLJGRbxceCaa95HgiW 2Jqw== X-Gm-Message-State: ALyK8tKXUUN8K79/7wAaPuvxONzwsGO2rkWTDpkQ3iUxAmSCMLNtWU/dEFXe3sm6PnEw+h3g X-Received: by 10.194.11.5 with SMTP id m5mr23165753wjb.119.1466586373407; Wed, 22 Jun 2016 02:06:13 -0700 (PDT) Received: from ping.vm.6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by smtp.gmail.com with ESMTPSA id z5sm7019178wme.5.2016.06.22.02.06.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Jun 2016 02:06:13 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org Cc: Ferruh Yigit , Adrien Mazarguil Date: Wed, 22 Jun 2016 11:05:35 +0200 Message-Id: <1466586355-30777-6-git-send-email-nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1466586355-30777-1-git-send-email-nelio.laranjeiro@6wind.com> References: <1466493818-1877-1-git-send-email-nelio.laranjeiro@6wind.com> <1466586355-30777-1-git-send-email-nelio.laranjeiro@6wind.com> Subject: [dpdk-dev] [PATCH v4 05/25] mlx5: remove configuration variable X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jun 2016 09:06:14 -0000 There is no scatter/gather support anymore, CONFIG_RTE_LIBRTE_MLX5_SGE_WR_N has no purpose and can be removed. Signed-off-by: Nelio Laranjeiro Signed-off-by: Adrien Mazarguil --- config/common_base | 1 - doc/guides/nics/mlx5.rst | 7 ------- drivers/net/mlx5/Makefile | 4 ---- drivers/net/mlx5/mlx5_defs.h | 5 ----- drivers/net/mlx5/mlx5_rxq.c | 4 ---- drivers/net/mlx5/mlx5_txq.c | 4 ---- 6 files changed, 25 deletions(-) diff --git a/config/common_base b/config/common_base index ead5984..39e6333 100644 --- a/config/common_base +++ b/config/common_base @@ -207,7 +207,6 @@ CONFIG_RTE_LIBRTE_MLX4_SOFT_COUNTERS=1 # CONFIG_RTE_LIBRTE_MLX5_PMD=n CONFIG_RTE_LIBRTE_MLX5_DEBUG=n -CONFIG_RTE_LIBRTE_MLX5_SGE_WR_N=4 CONFIG_RTE_LIBRTE_MLX5_MAX_INLINE=0 CONFIG_RTE_LIBRTE_MLX5_TX_MP_CACHE=8 diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index d9196d1..84c35a0 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -114,13 +114,6 @@ These options can be modified in the ``.config`` file. adds additional run-time checks and debugging messages at the cost of lower performance. -- ``CONFIG_RTE_LIBRTE_MLX5_SGE_WR_N`` (default **4**) - - Number of scatter/gather elements (SGEs) per work request (WR). Lowering - this number improves performance but also limits the ability to receive - scattered packets (packets that do not fit a single mbuf). The default - value is a safe tradeoff. - - ``CONFIG_RTE_LIBRTE_MLX5_MAX_INLINE`` (default **0**) Amount of data to be inlined during TX operations. Improves latency. diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index 999ada5..656a6e1 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -86,10 +86,6 @@ else CFLAGS += -DNDEBUG -UPEDANTIC endif -ifdef CONFIG_RTE_LIBRTE_MLX5_SGE_WR_N -CFLAGS += -DMLX5_PMD_SGE_WR_N=$(CONFIG_RTE_LIBRTE_MLX5_SGE_WR_N) -endif - ifdef CONFIG_RTE_LIBRTE_MLX5_MAX_INLINE CFLAGS += -DMLX5_PMD_MAX_INLINE=$(CONFIG_RTE_LIBRTE_MLX5_MAX_INLINE) endif diff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h index 09207d9..da1c90e 100644 --- a/drivers/net/mlx5/mlx5_defs.h +++ b/drivers/net/mlx5/mlx5_defs.h @@ -54,11 +54,6 @@ /* RSS Indirection table size. */ #define RSS_INDIRECTION_TABLE_SIZE 256 -/* Maximum number of Scatter/Gather Elements per Work Request. */ -#ifndef MLX5_PMD_SGE_WR_N -#define MLX5_PMD_SGE_WR_N 4 -#endif - /* Maximum size for inline data. */ #ifndef MLX5_PMD_MAX_INLINE #define MLX5_PMD_MAX_INLINE 0 diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index 38ff9fd..4000624 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -976,10 +976,6 @@ rxq_setup(struct rte_eth_dev *dev, struct rxq *rxq, uint16_t desc, ERROR("%p: invalid number of RX descriptors", (void *)dev); return EINVAL; } - if (MLX5_PMD_SGE_WR_N > 1) { - ERROR("%p: RX scatter is not supported", (void *)dev); - return ENOTSUP; - } /* Toggle RX checksum offload if hardware supports it. */ if (priv->hw_csum) tmpl.csum = !!dev->data->dev_conf.rxmode.hw_ip_checksum; diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c index 5a248c9..59974c5 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c @@ -264,10 +264,6 @@ txq_setup(struct rte_eth_dev *dev, struct txq *txq, uint16_t desc, ERROR("%p: invalid number of TX descriptors", (void *)dev); return EINVAL; } - if (MLX5_PMD_SGE_WR_N > 1) { - ERROR("%p: TX gather is not supported", (void *)dev); - return EINVAL; - } /* MRs will be registered in mp2mr[] later. */ attr.rd = (struct ibv_exp_res_domain_init_attr){ .comp_mask = (IBV_EXP_RES_DOMAIN_THREAD_MODEL | -- 2.1.4