From patchwork Tue Aug 1 16:54:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Mazarguil X-Patchwork-Id: 27331 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 2D5ADA182; Tue, 1 Aug 2017 18:55:42 +0200 (CEST) Received: from mail-wr0-f174.google.com (mail-wr0-f174.google.com [209.85.128.174]) by dpdk.org (Postfix) with ESMTP id 5944DA100 for ; Tue, 1 Aug 2017 18:55:19 +0200 (CEST) Received: by mail-wr0-f174.google.com with SMTP id f21so9176975wrf.5 for ; Tue, 01 Aug 2017 09:55:19 -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=1V2Ariio45cSq7bky8tu2T2YvIChQy7DSR9cQ0dZDto=; b=wsaNYIcLAxMEJH+JrQGZAgvWg9Ii3Q6zSBEQ+DMEhs1SMNeKm2kXGvNYDPqt//Oi7Q rl2VppuVfu9933RrD4g908x7iHd4kjYTNv/LAEKlaWaCCKFzVsiPdu1h8GHR5GcKGsfK oBDzL0S3jkyihMMAITIXFJbafGoK1cc5Y+OzgdfuQ3wRRli1Wj85dVcXfmi5/7ikb97y ov3QQJOgtEt5T6lYV30Le6D6CiGH5gDNnB8qBEXq62LxGnEKDI+aAjVhCCleGq/wvfJd J8+J6cbvFt2e+KcDiigKcnWd8t74pqj6SNamBkapS29ihBOpu6226n2W9Q17dW0oNtY2 00Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1V2Ariio45cSq7bky8tu2T2YvIChQy7DSR9cQ0dZDto=; b=M1YdUGNWwBoQ5hY0pVrsJyhuTGUwP6O0cqkn+58r+o2yRvWmZ6TiNPBThhObDEzbco pcnEuUCh679VCpqQNo4FxnFCuzrJkC5J8AeqenTI1UH91tgQpa62i1tVZlZJcdkqUrxY IVT6E9Fp+w9FQgssD4oJ2edujvVfUkx1V9JEtcI7P/vSPR7y6WOXVdk4/xAF9/ui0HSr ZgbJr05bGXpf9zK8YHw89cQgGBITq+zTyChThn3ZXoZsne7i/4Mui63r67uIB+dN7CS4 rP9krZd8iUTzisy/qSk9cgTTII2SB9MwMLyOXWgSR/wzDeenu6sWZaG0AY1NT0K7re0d P2PQ== X-Gm-Message-State: AIVw112ZXSXIYCvn8xj6WT5AhfkHH4s0pwZ9By805J1RavP4zen5Qpjo GAcg1f0rimYzl/JdRCM= X-Received: by 10.223.139.219 with SMTP id w27mr14920547wra.146.1501606518615; Tue, 01 Aug 2017 09:55:18 -0700 (PDT) Received: from 6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id w136sm1718687wmd.45.2017.08.01.09.55.17 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 01 Aug 2017 09:55:17 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Cc: Moti Haimovsky Date: Tue, 1 Aug 2017 18:54:07 +0200 Message-Id: <4cf0652c62c38e867e96a30cf878557ef88a540a.1501598384.git.adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v1 20/48] net/mlx4: drop inline receive support X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The Verbs API used to implement inline receive is deprecated. Support will be added back after refactoring the PMD. Signed-off-by: Moti Haimovsky Signed-off-by: Adrien Mazarguil --- drivers/net/mlx4/mlx4.c | 52 -------------------------------------------- drivers/net/mlx4/mlx4.h | 1 - 2 files changed, 53 deletions(-) diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 5546c0a..227c02c 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -1925,8 +1925,6 @@ rxq_setup_qp(struct priv *priv, struct ibv_cq *cq, uint16_t desc, .res_domain = rd, }; - attr.max_inl_recv = priv->inl_recv_size, - attr.comp_mask |= IBV_EXP_QP_INIT_ATTR_INL_RECV; return ibv_exp_create_qp(priv->ctx, &attr); } @@ -2988,25 +2986,6 @@ priv_get_mac(struct priv *priv, uint8_t (*mac)[ETHER_ADDR_LEN]) return 0; } -/** - * Retrieve integer value from environment variable. - * - * @param[in] name - * Environment variable name. - * - * @return - * Integer value, 0 if the variable is not set. - */ -static int -mlx4_getenv_int(const char *name) -{ - const char *val = getenv(name); - - if (val == NULL) - return 0; - return atoi(val); -} - static void mlx4_dev_link_status_handler(void *); static void @@ -3649,13 +3628,11 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) struct ibv_pd *pd = NULL; struct priv *priv = NULL; struct rte_eth_dev *eth_dev = NULL; - struct ibv_exp_device_attr exp_device_attr; struct ether_addr mac; /* If port is not enabled, skip. */ if (!(conf.ports.enabled & (1 << i))) continue; - exp_device_attr.comp_mask = IBV_EXP_DEVICE_ATTR_EXP_CAP_FLAGS; DEBUG("using port %u", port); @@ -3708,35 +3685,6 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev) priv->port = port; priv->pd = pd; priv->mtu = ETHER_MTU; - if (ibv_exp_query_device(ctx, &exp_device_attr)) { - ERROR("ibv_exp_query_device() failed"); - err = ENODEV; - goto port_error; - } - - priv->inl_recv_size = mlx4_getenv_int("MLX4_INLINE_RECV_SIZE"); - - if (priv->inl_recv_size) { - exp_device_attr.comp_mask = - IBV_EXP_DEVICE_ATTR_INLINE_RECV_SZ; - if (ibv_exp_query_device(ctx, &exp_device_attr)) { - INFO("Couldn't query device for inline-receive" - " capabilities."); - priv->inl_recv_size = 0; - } else { - if ((unsigned)exp_device_attr.inline_recv_sz < - priv->inl_recv_size) { - INFO("Max inline-receive (%d) <" - " requested inline-receive (%u)", - exp_device_attr.inline_recv_sz, - priv->inl_recv_size); - priv->inl_recv_size = - exp_device_attr.inline_recv_sz; - } - } - INFO("Set inline receive size to %u", - priv->inl_recv_size); - } priv->vf = vf; /* Configure the first MAC address by default. */ diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h index 38c93f1..66efb98 100644 --- a/drivers/net/mlx4/mlx4.h +++ b/drivers/net/mlx4/mlx4.h @@ -217,7 +217,6 @@ struct priv { unsigned int vf:1; /* This is a VF device. */ unsigned int pending_alarm:1; /* An alarm is pending. */ unsigned int isolated:1; /* Toggle isolated mode. */ - unsigned int inl_recv_size; /* Inline recv size */ /* RX/TX queues. */ unsigned int rxqs_n; /* RX queues array size. */ unsigned int txqs_n; /* TX queues array size. */