From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by dpdk.org (Postfix) with ESMTP id 822E39E7 for ; Wed, 9 Nov 2016 10:58:17 +0100 (CET) Received: by mail-wm0-f53.google.com with SMTP id p190so297306482wmp.1 for ; Wed, 09 Nov 2016 01:58:17 -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=MQLC48t+aP/U2ygJEM1JZeXbxDJ3WDsltUw5eya/hhg=; b=eqtdJYDQSI/BIr593mY0cGiXHSaea1I00yicB1/x5boOQU/qQ1GE+4c+t163UmRg6T 547KN6FCz/0HdM6zOmuBRMgpjjP/g81VBCh6Jfl100UdUG8q3hZfPW8wvDFW1Mh/zj2H po6YfwHJRC5MU91yp/jaVaPUoi1rX45eV08zkU/L5adnpgu7itR62X9gnQevp5tw4r95 PvvXZr5bqK0Fb8BzxOkADHXLZYxX7YwYUxorVpB4tSsRTneXTbm83aBDm75kPEwiY8E5 JT7dBm6xSDgTEzdnS8m5NXAqBO8wdo7Rap5pCAgCgBbSVCFJkGMLrQyiaoD6Ce2K7mdz 2v5A== 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=MQLC48t+aP/U2ygJEM1JZeXbxDJ3WDsltUw5eya/hhg=; b=Oorn7Cq2d6xPOgMCJOLzlhP9FHGgBYNxVhqHh7SegDnxSamwOndcNtC+ISr1uJeqgU OArdL5kn+/Hq3xxxUkjBMh0NICRzEMosW+ziZtEyoZJpDdFYRAAFF47R6daEMKvogPdZ pI1sMYlymDIgxCHZPmKU5nho1MJQYGYj7E4stAkhbxYZo5/Sqrr2n2D4zXb0AlAVTM7M aqqJabGEwQcFhUgErTVwmKDgBYSVhmnpA+b+m75biVDl3yg0MnBlQSnoBUhvPhTZgZ07 FkbL6T1RPvPS1ieMZyBPLTFqKNcnHHrwr3qo47pNCsoF32sWwAKFYk1HxCj3jq0EiH2W R7UA== X-Gm-Message-State: ABUngvcsoUu5444YFwOcjcU38jYKdWkFvFAVdAuf3OXM+Wte7GM9qng4QU07Tv43Aw7hO5E1 X-Received: by 10.194.163.234 with SMTP id yl10mr12589322wjb.112.1478685497039; Wed, 09 Nov 2016 01:58:17 -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 c133sm13926057wme.12.2016.11.09.01.58.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Nov 2016 01:58:16 -0800 (PST) From: Nelio Laranjeiro To: stable@dpdk.org, Yuanhan Liu Cc: =?UTF-8?q?N=C3=A9lio=20Laranjeiro?= , Adrien Mazarguil Date: Wed, 9 Nov 2016 10:57:40 +0100 Message-Id: <939798ff32790eebc1fd59655222d20d163caf3c.1478683594.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 v2 01/12] 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: Wed, 09 Nov 2016 09:58:17 -0000 From: Nélio Laranjeiro [ backported from upstream commit c904ae25feb4de94683963a774f726cff5b08a0c ] 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