From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <nelio.laranjeiro@6wind.com>
Received: from mail-wm0-f41.google.com (mail-wm0-f41.google.com [74.125.82.41])
by dpdk.org (Postfix) with ESMTP id F1062C5AE
for <dev@dpdk.org>; Thu, 23 Jun 2016 18:53:48 +0200 (CEST)
Received: by mail-wm0-f41.google.com with SMTP id a66so58503879wme.0
for <dev@dpdk.org>; Thu, 23 Jun 2016 09:53:48 -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=QqPp8uZCjzdoKNEwVYDiQ7uQ40Ofg1QQTInlsTKsBBv9goeEpGyE2oMJBVRmqmIjzJ
2h9Oxuzp5w9FbWPGRUektfJOaiwkOGGsBar/RRjiqfuS6vvFlY013TwFP6FdrO3N4U2v
PNUoeJ2CMU84hnZa5pcGC2U4HJf3ulHo/0K6YL7jU6DD2WcfFZgncMZTXV/kwvmIVF1M
Gr/4Bo3LVsQeSZpZtaW6X68YU/w4Nt8MQdS3VepA4dskviFUiW+a3yyD4fazQy64pFYp
AFTaW1haOHBQhRAVyAOrQnwZ1RevW2aOw8O3L0jjd9pYPwW5pMyxIZhz5L462RNyQpXU
5lQg==
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=D19Lm9VWeP5kdqahINA3XNJSBySVRbnR861GHTyI9RKw7fzQy/PgcuWViudNC/0B4H
h6DC0yShambA/HxeGE9DbFRUO44D+MLL2MNwYIn/LmghcvDso1qA8AR5E2ntttqbJQBF
sJ0euBLAsG4JV693eiuk0raKVqFLmy7IkkeriRAHScy5+60P78vAjt7icfNttig/dvN4
LMF6fHBYon9w8L/BJAuFWdzSSf0Q28E6mTw/82OWLlLqgwq78hUtcysr19rXs2iQZ85z
Tqqrw3/5X6vYcy8zN4uK9tLYYqtJzixxZEp4f1Y3mGXYa6GiccwnVQgw4WQzJHvIBiMx
FVRQ==
X-Gm-Message-State: ALyK8tL9fI6EzQP7TINQjR4dAJ6F5c7IOEep+2wL1MITHm2y5wjrZP04D3a8WucTP7x3CaWP
X-Received: by 10.194.58.239 with SMTP id u15mr30441540wjq.73.1466700828710;
Thu, 23 Jun 2016 09:53:48 -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 ze10sm992509wjb.2.2016.06.23.09.53.47
(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
Thu, 23 Jun 2016 09:53:48 -0700 (PDT)
From: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
To: dev@dpdk.org
Cc: Ferruh Yigit <ferruh.yigit@intel.com>,
Adrien Mazarguil <adrien.mazarguil@6wind.com>
Date: Thu, 23 Jun 2016 18:53:01 +0200
Message-Id: <1466700801-10383-6-git-send-email-nelio.laranjeiro@6wind.com>
X-Mailer: git-send-email 2.1.4
In-Reply-To: <1466700801-10383-1-git-send-email-nelio.laranjeiro@6wind.com>
References: <1466586355-30777-1-git-send-email-nelio.laranjeiro@6wind.com>
<1466700801-10383-1-git-send-email-nelio.laranjeiro@6wind.com>
Subject: [dpdk-dev] [PATCH v5 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 <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2016 16:53:49 -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 <nelio.laranjeiro@6wind.com>
Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
---
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