commit 60bd3028270b1ae297def6f14b65e24a3697a3ed
author Rui Cai <rucai@microsoft.com> Fri May 11 21:52:22 2018 +0000
committer Damjan Marion <dmarion.lists@gmail.com> Sat May 12 07:13:46 2018 +0000
tree 1f33b8fccecfcfddf8c3191e6aea1db565e0c004
parent ab13462c9024a596a77d40f477ada57280e6b059

dpdk: Add build related keywords for failsafe PMD

Added build related keywords for TAP, FAILSAFE PMD
and also added some missing keywords for mlx4 PMD

This is part of initial effort to enable vpp running over
dpdk on failsafe PMD in Microsoft Azure (1/4).

Change-Id: I2aebf209fbc6db030185f41971b51a593a003a3a
Signed-off-by: Rui Cai <rucai@microsoft.com>

build-data/packages/dpdk.mk

diff --git a/build-data/packages/dpdk.mk b/build-data/packages/dpdk.mk
index 92eb631..ab2e39a 100644
--- a/build-data/packages/dpdk.mk
+++ b/build-data/packages/dpdk.mk
@@ -27,6 +27,11 @@
 DPDK_MAKE_ARGS += DPDK_MLX5_PMD=y
 endif
 
+DPDK_MLX4_PMD=$(strip $($(PLATFORM)_uses_dpdk_mlx4_pmd))
+ifneq ($(DPDK_MLX4_PMD),)
+DPDK_MAKE_ARGS += DPDK_MLX4_PMD=y
+endif
+
 DPDK_PLATFORM_TARGET=$(strip $($(PLATFORM)_dpdk_target))
 ifneq ($(DPDK_PLATFORM_TARGET),)
 DPDK_MAKE_ARGS += DPDK_TARGET=$(DPDK_PLATFORM_TARGET)

build-data/packages/vpp.mk

diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk
index 4122591..19e32ef 100644
--- a/build-data/packages/vpp.mk
+++ b/build-data/packages/vpp.mk
@@ -39,6 +39,9 @@
 ifeq ($($(PLATFORM)_uses_dpdk_mlx5_pmd),yes)
 vpp_configure_args += --with-dpdk-mlx5-pmd
 endif
+ifeq ($($(PLATFORM)_uses_dpdk_mlx4_pmd),yes)
+vpp_configure_args += --with-dpdk-mlx4-pmd
+endif
 else
 vpp_configure_args += --disable-dpdk-plugin
 endif

build-data/platforms/vpp.mk

diff --git a/build-data/platforms/vpp.mk b/build-data/platforms/vpp.mk
index 5750181..ad15d7e 100644
--- a/build-data/platforms/vpp.mk
+++ b/build-data/platforms/vpp.mk
@@ -29,6 +29,7 @@
 vpp_root_packages = vpp vom
 
 # DPDK configuration parameters
+# vpp_uses_dpdk_mlx4_pmd = yes
 # vpp_uses_dpdk_mlx5_pmd = yes
 # vpp_uses_external_dpdk = yes
 # vpp_dpdk_inc_dir = /usr/include/dpdk

dpdk/Makefile

diff --git a/dpdk/Makefile b/dpdk/Makefile
index 799d9c4..ebe62bb 100644
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -22,6 +22,8 @@
 DPDK_DEBUG            ?= n
 DPDK_MLX4_PMD         ?= n
 DPDK_MLX5_PMD         ?= n
+DPDK_TAP_PMD          ?= n
+DPDK_FAILSAFE_PMD     ?= n
 
 B := $(DPDK_BUILD_DIR)
 I := $(DPDK_INSTALL_DIR)
@@ -199,8 +201,9 @@
 	$(call set,RTE_LIBRTE_MLX5_PMD,$(DPDK_MLX5_PMD))
 	$(call set,RTE_LIBRTE_MLX4_DLOPEN_DEPS,$(DPDK_MLX4_PMD))
 	$(call set,RTE_LIBRTE_MLX5_DLOPEN_DEPS,$(DPDK_MLX5_PMD))
+	$(call set,RTE_LIBRTE_PMD_TAP,$(DPDK_TAP_PMD))
+	$(call set,RTE_LIBRTE_PMD_FAILSAFE,$(DPDK_FAILSAFE_PMD))
 	@# not needed
-	$(call set,RTE_LIBRTE_PMD_TAP,n)
 	$(call set,RTE_LIBRTE_TIMER,n)
 	$(call set,RTE_LIBRTE_CFGFILE,n)
 	$(call set,RTE_LIBRTE_LPM,n)