Add missing counters for P2P ethernet interfaces

[vpp.git] / dpdk / Makefile

diff --git a/dpdk/Makefile b/dpdk/Makefile
index 659439c..5e947b3 100644 (file)
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -31,8 +31,15 @@ DPDK_TARBALL := dpdk-$(DPDK_VERSION).tar.xz
 DPDK_TAR_URL := $(DPDK_BASE_URL)/$(DPDK_TARBALL)
 DPDK_17.02_TARBALL_MD5_CKSUM := 6b9f7387c35641f4e8dbba3e528f2376
 DPDK_17.05_TARBALL_MD5_CKSUM := 0a68c31cd6a6cabeed0a4331073e4c05
+DPDK_17.08_TARBALL_MD5_CKSUM := 0641f59ea8ea98afefa7cfa2699f6241
 DPDK_SOURCE := $(B)/dpdk-$(DPDK_VERSION)
 
+ifeq ($(MACHINE),$(filter $(MACHINE),x86_64))
+AESNI := y
+else
+AESNI := n
+endif
+
 IPSEC_MB_VER := 0.45
 AESNIMB_LIB_TARBALL := v$(IPSEC_MB_VER).tar.gz
 AESNIMB_LIB_TARBALL_URL := http://github.com/01org/intel-ipsec-mb/archive/$(AESNIMB_LIB_TARBALL)
@@ -60,7 +67,6 @@ ifeq ($(MACHINE),$(filter $(MACHINE),x86_64 i686))
 DPDK_TARGET           ?= $(MACHINE)-native-linuxapp-$(DPDK_CC)
 DPDK_MACHINE          ?= nhm
 DPDK_TUNE             ?= core-avx2
-
 ##############################################################################
 # Cavium ThunderX
 ##############################################################################
@@ -139,8 +145,8 @@ $(B)/custom-config: $(B)/.patch.ok Makefile
        $(call set,RTE_LIBRTE_PMD_BOND,y)
        $(call set,RTE_LIBRTE_IP_FRAG,y)
        $(call set,RTE_LIBRTE_PMD_QAT,y)
-       $(call set,RTE_LIBRTE_PMD_AESNI_MB,y)
-       $(call set,RTE_LIBRTE_PMD_AESNI_GCM,y)
+       $(call set,RTE_LIBRTE_PMD_AESNI_MB,$(AESNI))
+       $(call set,RTE_LIBRTE_PMD_AESNI_GCM,$(AESNI))
        $(call set,RTE_LIBRTE_MLX4_PMD,$(DPDK_MLX4_PMD))
        $(call set,RTE_LIBRTE_MLX5_PMD,$(DPDK_MLX5_PMD))
        @# not needed
@@ -177,8 +183,10 @@ $(CURDIR)/$(ISA_L_CRYPTO_LIB_TARBALL):
        fi
 
 DPDK_DOWNLOADS = $(CURDIR)/$(DPDK_TARBALL)
+ifeq ($(AESNI),y)
 DPDK_DOWNLOADS += $(CURDIR)/$(AESNIMB_LIB_TARBALL)
 DPDK_DOWNLOADS += $(CURDIR)/$(ISA_L_CRYPTO_LIB_TARBALL)
+endif
 
 $(B)/.download.ok: $(DPDK_DOWNLOADS)
        @mkdir -p $(B)
@@ -194,11 +202,13 @@ download: $(B)/.download.ok
 $(B)/.extract.ok: $(B)/.download.ok
        @echo --- extracting $(DPDK_TARBALL) ---
        @tar --directory $(B) --extract --file $(CURDIR)/$(DPDK_TARBALL)
+ifeq ($(AESNI),y)
        @echo --- extracting $(AESNIMB_LIB_TARBALL) ---
        @tar --directory $(B) --extract --file $(CURDIR)/$(AESNIMB_LIB_TARBALL)
        @echo --- extracting $(ISA_L_CRYPTO_LIB_TARBALL) ---
        @tar --directory $(B) --extract --file $(CURDIR)/$(ISA_L_CRYPTO_LIB_TARBALL)
        @touch $@
+endif
 
 .PHONY: extract
 extract: $(B)/.extract.ok
@@ -224,7 +234,11 @@ $(B)/.config.ok: $(B)/.patch.ok $(B)/custom-config
 config: $(B)/.config.ok
 
 # Order matters
+ifeq ($(AESNI),y)
 BUILD_TARGETS += build-ipsec-mb build-isal-crypto build-dpdk
+else
+BUILD_TARGETS += build-dpdk
+endif
 
 .PHONY: build-ipsec-mb
 build-ipsec-mb:
@@ -236,7 +250,8 @@ build-ipsec-mb:
 build-isal-crypto:
        mkdir -p $(I)/lib/
        cd $(ISA_L_CRYPTO_LIB_SOURCE) && ./autogen.sh && \
-         ./configure --prefix=$(ISA_L_CRYPTO_INSTALL_DIR) CFLAGS='-fPIC -DPIC -O2'
+         ./configure --prefix=$(ISA_L_CRYPTO_INSTALL_DIR) \
+         --libdir=$(ISA_L_CRYPTO_INSTALL_DIR)/lib CFLAGS='-fPIC -DPIC -O2'
        make -C $(ISA_L_CRYPTO_LIB_SOURCE) -j install
        cp $(ISA_L_CRYPTO_INSTALL_DIR)/lib/libisal_crypto.a $(I)/lib/