From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f41.google.com (mail-wm0-f41.google.com [74.125.82.41]) by dpdk.org (Postfix) with ESMTP id 869D6FFA for ; Tue, 8 Nov 2016 11:37:41 +0100 (CET) Received: by mail-wm0-f41.google.com with SMTP id a197so236348423wmd.0 for ; Tue, 08 Nov 2016 02:37:41 -0800 (PST) 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:mime-version:content-transfer-encoding; bh=UdTXHSvP74mSK4TqP/t+w6QKQXyePsBe51a7tBZW2zA=; b=W0neWD+4THmtob8ga6F98A7twFzd414oq1DKX+h5uC98lkpWNWVfyQCna8QSdgX9ef ex5QfZKan/j4W5XvR5TF7Hv6gEE6NiJAqeuV4W0E2CblMAzPIxn2lkHX+w+PF9HW/gWX qie3TCYMaAy6glofoceBKvNvdcs9Ij5rkPkCMoNVl+UyBq7u5A9ZnT4gnlH0m06XT8Fq NHkhIZnsKWL5M+XJid8+5tH4qyM86TwBzWPKJIpDeBvwbOLwM5RhAeeAiYHnE+MF7ANw o6ciribybMnMvIL0oY2USCeexds6dPhhYXbJP3TZZmRXEQY1/s5LI1nhI0X0HMbbdt4c GCrw== 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:mime-version :content-transfer-encoding; bh=UdTXHSvP74mSK4TqP/t+w6QKQXyePsBe51a7tBZW2zA=; b=NcZIRm370Ek2d5C2/TQAXwuc+E4K54WxmENAL5+cazZsrukvHGqymhutetv1rNQXet LiKTJEOcdhGXAiMyDuk5tOysaQBXFh8ghJd3UW7Dz4mKce0AE8mU2/DadtMH79eSvQC2 SEs2y2bu2adfGf9h/hqPUWQU/pY0odtJvrhH4SqP903RwbabFQSjXVxZxIMZrPBn5Vif xYTaUqHv2iyDtCpEn7rf5QA3OsUbo5cn13Rp1B91QidpwTeGJKBdUR+C7LRHCeU/MkQK TyjQs87bD5jexDfdHY0EUbJJSfAPDKyYGwpt/DxfWi+v+fcks858fwJ6KvWFFZ7Us2E3 8CzA== X-Gm-Message-State: ABUngvet4XVH+7dgRWaaKpAGYpibbQKvBOtR9vvuUVScoItucvhzgBHw2GqvBCqUhquYfCwa X-Received: by 10.28.126.146 with SMTP id z140mr11425483wmc.84.1478601461267; Tue, 08 Nov 2016 02:37:41 -0800 (PST) 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 k74sm18837414wmd.18.2016.11.08.02.37.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Nov 2016 02:37:40 -0800 (PST) From: Nelio Laranjeiro To: stable@dpdk.org, Yuanhan Liu Cc: =?UTF-8?q?N=C3=A9lio=20Laranjeiro?= , Adrien Mazarguil Date: Tue, 8 Nov 2016 11:36:42 +0100 Message-Id: <10f9643243ac02bf1fe2209f5934d4005d14ddd7.1478600855.git.nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 01/14] net/mlx5: support Mellanox OFED 3.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Nov 2016 10:37:41 -0000 From: Nélio Laranjeiro Some macros are renamed by Mellanox OFED 3.4. Signed-off-by: Nelio Laranjeiro Acked-by: Adrien Mazarguil --- drivers/net/mlx5/Makefile | 5 +++++ drivers/net/mlx5/mlx5_prm.h | 6 ++++++ drivers/net/mlx5/mlx5_rxtx.c | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index f6d3938..2c13c30 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -116,6 +116,11 @@ mlx5_autoconf.h.new: $(RTE_SDK)/scripts/auto-config-h.sh infiniband/mlx5_hw.h \ enum MLX5_ETH_VLAN_INLINE_HEADER_SIZE \ $(AUTOCONF_OUTPUT) + $Q sh -- '$<' '$@' \ + HAVE_VERBS_MLX5_OPCODE_TSO \ + infiniband/mlx5_hw.h \ + enum MLX5_OPCODE_TSO \ + $(AUTOCONF_OUTPUT) # Create mlx5_autoconf.h or update it in case it differs from the new one. diff --git a/drivers/net/mlx5/mlx5_prm.h b/drivers/net/mlx5/mlx5_prm.h index 4383009..e23d5cb 100644 --- a/drivers/net/mlx5/mlx5_prm.h +++ b/drivers/net/mlx5/mlx5_prm.h @@ -44,6 +44,8 @@ #pragma GCC diagnostic error "-Wpedantic" #endif +#include "mlx5_autoconf.h" + /* Get CQE owner bit. */ #define MLX5_CQE_OWNER(op_own) ((op_own) & MLX5_CQE_OWNER_MASK) @@ -71,6 +73,10 @@ /* Room for inline data in multi-packet WQE. */ #define MLX5_MWQE64_INL_DATA 28 +#ifndef HAVE_VERBS_MLX5_OPCODE_TSO +#define MLX5_OPCODE_TSO MLX5_OPCODE_LSO_MPW /* Compat with OFED 3.3. */ +#endif + /* Subset of struct mlx5_wqe_eth_seg. */ struct mlx5_wqe_eth_seg_small { uint32_t rsvd0; diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index a13cbc7..cc62e78 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -908,7 +908,7 @@ mlx5_mpw_new(struct txq *txq, struct mlx5_mpw *mpw, uint32_t length) mpw->wqe->mpw.eseg.rsvd2 = 0; mpw->wqe->mpw.ctrl.data[0] = htonl((MLX5_OPC_MOD_MPW << 24) | (txq->wqe_ci << 8) | - MLX5_OPCODE_LSO_MPW); + MLX5_OPCODE_TSO); mpw->wqe->mpw.ctrl.data[2] = 0; mpw->wqe->mpw.ctrl.data[3] = 0; mpw->data.dseg[0] = &mpw->wqe->mpw.dseg[0]; @@ -1107,7 +1107,7 @@ mlx5_mpw_inline_new(struct txq *txq, struct mlx5_mpw *mpw, uint32_t length) mpw->wqe = &(*txq->wqes)[idx]; mpw->wqe->mpw_inl.ctrl.data[0] = htonl((MLX5_OPC_MOD_MPW << 24) | (txq->wqe_ci << 8) | - MLX5_OPCODE_LSO_MPW); + MLX5_OPCODE_TSO); mpw->wqe->mpw_inl.ctrl.data[2] = 0; mpw->wqe->mpw_inl.ctrl.data[3] = 0; mpw->wqe->mpw_inl.eseg.mss = htons(length); -- 2.1.4