From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-f48.google.com (mail-lf0-f48.google.com [209.85.215.48]) by dpdk.org (Postfix) with ESMTP id 352A3ADC2 for ; Tue, 21 Jun 2016 09:23:59 +0200 (CEST) Received: by mail-lf0-f48.google.com with SMTP id q132so9614654lfe.3 for ; Tue, 21 Jun 2016 00:23:59 -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 :in-reply-to:references; bh=nZtc2/hgEjaFIMVqw41Jq++YC5FG4WQREfVAeAwhzU8=; b=aSq2ttz8FMSYGDtJP0SL1TUNJ4pIbb80ekwXSJAQ+HeiQopJwNiXx4/NEgbPDER0+D 0vtsGraaIapyC+PtMzJiJPqYEM9aRCi01Jp4YylisiuuiS6hzYk/kBXBtFkiqfWTFXBv 8+8tf3EDSq8Eic6WWi/ryr6sCVJ85/n9f9P5BURO5sCaoTClsO27GZHN4Rgqe/rth/k6 /jVVwcPNgWXYIm2vD8jJlvI8J84nvvh+aKEsIkfnhTveJDwYo/LeZs7JgVtGbhay6kSG VDx1bHUpgTiNk5jTz249vjmKYY/qTsuoTvbqUKScDexbaJXROI6uWLjGSqZOyp/IwjQf Xjjw== 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:in-reply-to:references; bh=nZtc2/hgEjaFIMVqw41Jq++YC5FG4WQREfVAeAwhzU8=; b=GDU/Vzd3E7tU64/34h7XtCSz7aVmDJkOv8KOAZ/dZEbgeVNGQ44MHbEoO28vz7NRvk s8EcyDsIVgsVbhFrSP92pJQ4j6Gd3dRQdHMnhgQxH8AsSB/M+0y77aqo0d9bFiVa1CXT kHk4BQriaZtDl20VKkHhFZvgNZ00F5l/6jVWer8A0O2nbLpG2EwCFB72DFmNIWb/uh8U daoouN7qhH6Z1qVq2z/CZDFHdXsTIr9FOC2DYH29kUyKFVl1mcqHF6+RY1M7US7WAItm kzqzQCTsnBWD7g3Yt73sKj833D1DFlcG6L94r5jQ3T4mnKXtJ3zhW1rEZaZT0q4IDJgj FlnA== X-Gm-Message-State: ALyK8tKKR9MfZnzNb1EpVxkP6bVV+TSE36Zv8ZCQQnVxUOvaQxxfRlsfuRtiK/LPLb0s98xj X-Received: by 10.25.149.146 with SMTP id x140mr4467066lfd.131.1466493838817; Tue, 21 Jun 2016 00:23:58 -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 mh10sm6527314lbb.14.2016.06.21.00.23.57 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 21 Jun 2016 00:23:58 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org Cc: Ferruh Yigit , Adrien Mazarguil Date: Tue, 21 Jun 2016 09:23:18 +0200 Message-Id: <1466493818-1877-6-git-send-email-nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1466493818-1877-1-git-send-email-nelio.laranjeiro@6wind.com> References: <1465379291-25310-1-git-send-email-nelio.laranjeiro@6wind.com> <1466493818-1877-1-git-send-email-nelio.laranjeiro@6wind.com> In-Reply-To: <1465379291-25310-1-git-send-email-nelio.laranjeiro@6wind.com> References: <1465379291-25310-1-git-send-email-nelio.laranjeiro@6wind.com> Subject: [dpdk-dev] [PATCH v3 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: Tue, 21 Jun 2016 07:23:59 -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