From 636b54879f9017deb00a28eaf4ab54cf0e6455de Mon Sep 17 00:00:00 2001 From: Hanoh Haim Date: Mon, 27 Feb 2017 15:06:14 +0200 Subject: mlx5, enforce OFED 4.0 Signed-off-by: Hanoh Haim --- linux_dpdk/ws_main.py | 17 +++++++++++++---- scripts/dpdk_setup_ports.py | 4 ++-- src/dpdk/drivers/net/mlx5/mlx5_prm.h | 1 + 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py index fba75407..a55fe6be 100755 --- a/linux_dpdk/ws_main.py +++ b/linux_dpdk/ws_main.py @@ -143,8 +143,11 @@ def missing_pkg_msg(fedora, ubuntu): def check_ofed(ctx): ctx.start_msg('Checking for OFED') ofed_info='/usr/bin/ofed_info' - ofed_ver= '-3.4-' - ofed_ver_show= 'v3.4' + + ofed_ver_re = re.compile('.*[-](\d)[.](\d)[-].*') + + ofed_ver= 40 + ofed_ver_show= '4.0' if not os.path.isfile(ofed_info): ctx.end_msg('not found', 'YELLOW') @@ -160,8 +163,14 @@ def check_ofed(ctx): ctx.end_msg('Expected several output lines from %s, got:\n%s' % (ofed_info, out), 'YELLOW') return False - if ofed_ver not in lines[0]: - ctx.end_msg('Expected version: %s, got: %s.' % (ofed_ver, lines[0]), 'YELLOW') + m= ofed_ver_re.match(str(lines[0])) + if m: + ver=int(m.group(1))*10+int(m.group(2)) + if ver < ofed_ver: + ctx.end_msg("installed OFED version is '%s' should be at least '%s' and up" % (lines[0],ofed_ver_show),'YELLOW') + return False + else: + ctx.end_msg("not found valid OFED version '%s' " % (lines[0]),'YELLOW') return False ctx.end_msg('Found needed version %s' % ofed_ver_show) diff --git a/scripts/dpdk_setup_ports.py b/scripts/dpdk_setup_ports.py index f619bc6c..c956b6c0 100755 --- a/scripts/dpdk_setup_ports.py +++ b/scripts/dpdk_setup_ports.py @@ -366,8 +366,8 @@ Other network devices ofed_ver_re = re.compile('.*[-](\d)[.](\d)[-].*') - ofed_ver= 34 - ofed_ver_show= '3.4-1' + ofed_ver= 40 + ofed_ver_show= '4.0' if not os.path.isfile(ofed_info): diff --git a/src/dpdk/drivers/net/mlx5/mlx5_prm.h b/src/dpdk/drivers/net/mlx5/mlx5_prm.h index 755b5d77..0a4cb8b8 100644 --- a/src/dpdk/drivers/net/mlx5/mlx5_prm.h +++ b/src/dpdk/drivers/net/mlx5/mlx5_prm.h @@ -80,6 +80,7 @@ /* Room for inline data in multi-packet WQE. */ #define MLX5_MWQE64_INL_DATA 28 +#define HAVE_VERBS_MLX5_OPCODE_TSO #ifndef HAVE_VERBS_MLX5_OPCODE_TSO #define MLX5_OPCODE_TSO MLX5_OPCODE_LSO_MPW /* Compat with OFED 3.3. */ #endif -- cgit 1.2.3-korg