diff options
| author |   Matthew Smith <mgsmith@netgate.com> | 2019-02-28 10:33:12 -0600 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2019-03-01 20:26:47 +0000 |
| commit | 84caa17a9d77e2986bb996a46d7c4a8a05fc868d (patch) | |
| tree | 8ee1b3d4c83448706259549b533b72ad5a37417e | |
| parent | b89609428977fe4ffae4e0823e28942fd4ac4ee8 (diff) | |
dpdk: update mlx[45] linking options
Upstream DPDK changed the names of the options to use dlopen()
with libibverbs and libmlx[45] from RTE_LIBRTE_MLX[45]_DLOPEN_DEPS
to RTE_IBVERBS_LINK_DLOPEN (handles both mlx4 and mlx5).
VPP's build option to enable this configuration when building DPDK
no longer worked starting when VPP moved to DPDK 19.02. Update VPP's
build options to enable the correct option name.
Change-Id: I8e34e1d3fc4ee8aac4fd6f2a7d27177f2b0dea50
Signed-off-by: Matthew Smith <mgsmith@netgate.com>
| -rw-r--r-- | build-data/packages/external.mk | 6 | ||||
| -rw-r--r-- | build/external/packages/dpdk.mk | 5 | ||||
| -rw-r--r-- | src/plugins/dpdk/CMakeLists.txt | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/build-data/packages/external.mk b/build-data/packages/external.mk index 1ed3f09af34..9bc04d3ef03 100644 --- a/build-data/packages/external.mk +++ b/build-data/packages/external.mk @@ -29,9 +29,9 @@ ifneq ($(DPDK_MLX5_PMD),) DPDK_MAKE_ARGS += DPDK_MLX5_PMD=y endif -DPDK_MLX5_PMD_DLOPEN_DEPS=$(strip $($(PLATFORM)_uses_dpdk_mlx5_dlopen_deps)) -ifneq ($(DPDK_MLX5_PMD_DLOPEN_DEPS),) -DPDK_MAKE_ARGS += DPDK_MLX5_PMD_DLOPEN_DEPS=y +DPDK_MLX_IBVERBS_DLOPEN=$(strip $($(PLATFORM)_uses_dpdk_ibverbs_link_dlopen)) +ifneq ($(DPDK_MLX_IBVERBS_DLOPEN),) +DPDK_MAKE_ARGS += DPDK_MLX_IBVERBS_DLOPEN=y endif DPDK_MLX4_PMD=$(strip $($(PLATFORM)_uses_dpdk_mlx4_pmd)) diff --git a/build/external/packages/dpdk.mk b/build/external/packages/dpdk.mk index 9e10fca1a49..68c27678931 100644 --- a/build/external/packages/dpdk.mk +++ b/build/external/packages/dpdk.mk @@ -17,7 +17,7 @@ DPDK_DOWNLOAD_DIR ?= $(DL_CACHE_DIR) DPDK_DEBUG ?= n DPDK_MLX4_PMD ?= n DPDK_MLX5_PMD ?= n -DPDK_MLX5_PMD_DLOPEN_DEPS ?= n +DPDK_MLX_IBVERBS_DLOPEN ?= n DPDK_TAP_PMD ?= n DPDK_FAILSAFE_PMD ?= n @@ -191,8 +191,7 @@ $(B)/custom-config: $(B)/.patch.ok Makefile $(call set,RTE_LIBRTE_MLX4_PMD,$(DPDK_MLX4_PMD)) $(call set,RTE_LIBRTE_MLX5_PMD,$(DPDK_MLX5_PMD)) $(call set,RTE_LIBRTE_PMD_SOFTNIC,n) - $(call set,RTE_LIBRTE_MLX4_DLOPEN_DEPS,$(DPDK_MLX4_PMD)) - $(call set,RTE_LIBRTE_MLX5_DLOPEN_DEPS,$(DPDK_MLX5_PMD_DLOPEN_DEPS)) + $(call set,RTE_IBVERBS_LINK_DLOPEN,$(DPDK_MLX_IBVERBS_DLOPEN)) $(call set,RTE_LIBRTE_PMD_TAP,$(DPDK_TAP_PMD)) $(call set,RTE_LIBRTE_GSO,$(DPDK_TAP_PMD)) $(call set,RTE_LIBRTE_PMD_FAILSAFE,$(DPDK_FAILSAFE_PMD)) diff --git a/src/plugins/dpdk/CMakeLists.txt b/src/plugins/dpdk/CMakeLists.txt index badf9af8349..0cbb0b46f6b 100644 --- a/src/plugins/dpdk/CMakeLists.txt +++ b/src/plugins/dpdk/CMakeLists.txt @@ -115,7 +115,7 @@ endif() if(DPDK_RTE_LIBRTE_MLX4_PMD OR DPDK_RTE_LIBRTE_MLX5_PMD) dpdk_find_library(MNL_LIB "mnl") list(APPEND DPDK_LINK_LIBRARIES "${MNL_LIB}") - if (DPDK_RTE_LIBRTE_MLX5_DLOPEN_DEPS) + if (DPDK_RTE_IBVERBS_LINK_DLOPEN) message(STATUS "DPDK depends on libmnl (Mellanox PMD requirement)") else() dpdk_find_library(IBVERBS_LIB "ibverbs") |