Merge remote-tracking branch 'origin/master' into master-enea

5 files changed, 74 insertions, 141 deletions

diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-dpdk-defconfig-select-RTE_MACHINE-type.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-dpdk-defconfig-select-RTE_MACHINE-type.patch
deleted file mode 100644
index 979541e9..00000000
--- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-dpdk-defconfig-select-RTE_MACHINE-type.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 6eaf6b1a61321acb824f9672c12d0e30a2110f52 Mon Sep 17 00:00:00 2001
-From: Ong Boon Leong <boon.leong.ong@intel.com>
-Date: Mon, 16 Mar 2015 11:10:43 +0800
-Subject: [PATCH] DPDK: defconfig: add selectable RTE_MACHINE option
-
-In order to make sure that DPDK build environment config can handle the
-package being built on different build machine for different target machine
-which will have different x86 architecture intrinsics than the build machine,
-we introduce DPDK_TARGET_MACH to be tunable from dpdk recipe. The machine
-type can be under mk/machine folder.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
----
- config/defconfig_i686-native-linuxapp-gcc   |    2 +-
- config/defconfig_x86_64-native-linuxapp-gcc |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/config/defconfig_i686-native-linuxapp-gcc b/config/defconfig_i686-native-linuxapp-gcc
-index a90de9b..c9a74a5 100644
---- a/config/defconfig_i686-native-linuxapp-gcc
-+++ b/config/defconfig_i686-native-linuxapp-gcc
-@@ -32,7 +32,7 @@
- 
- #include "common_linuxapp"
- 
--CONFIG_RTE_MACHINE="native"
-+CONFIG_RTE_MACHINE=$(DPDK_TARGET_MACH)
- 
- CONFIG_RTE_ARCH="i686"
- CONFIG_RTE_ARCH_I686=y
-diff --git a/config/defconfig_x86_64-native-linuxapp-gcc b/config/defconfig_x86_64-native-linuxapp-gcc
-index 60baf5b..0e4802d 100644
---- a/config/defconfig_x86_64-native-linuxapp-gcc
-+++ b/config/defconfig_x86_64-native-linuxapp-gcc
-@@ -32,7 +32,7 @@
- 
- #include "common_linuxapp"
- 
--CONFIG_RTE_MACHINE="native"
-+CONFIG_RTE_MACHINE=$(DPDK_TARGET_MACH)
- 
- CONFIG_RTE_ARCH="x86_64"
- CONFIG_RTE_ARCH_X86_64=y
--- 
-1.7.9.5
-
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-point-to-the-right-include-and-lib-path.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-point-to-the-right-include-and-lib-path.patch
new file mode 100644
index 00000000..75bb517d
--- /dev/null
+++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-and-2.0.0-point-to-the-right-include-and-lib-path.patch
@@ -0,0 +1,43 @@
+From 928595c80ae28d19861d7e76ed898a8fb3f2c1dc Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anujx.mittal@intel.com>
+Date: Fri, 24 Jul 2015 23:57:17 +0800
+Subject: [PATCH] dpdk: point to the right include and lib path
+
+Upstream-Status: Inappropriate [Configuration]
+
+Make sure that we point to the right location of qat
+lac headers and library.
+
+Signed-off-by: Anuj Mittal <anujx.mittal@intel.com>
+---
+ examples/dpdk_qat/Makefile |    7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/examples/dpdk_qat/Makefile b/examples/dpdk_qat/Makefile
+index f1e06a1..5b906f7 100644
+--- a/examples/dpdk_qat/Makefile
++++ b/examples/dpdk_qat/Makefile
+@@ -66,18 +66,15 @@ SRCS-y := main.c crypto.c
+ 
+ CFLAGS += -O3
+ CFLAGS += $(WERROR_FLAGS)
+-CFLAGS += -I$(ICP_ROOT)/quickassist/include \
+-               -I$(ICP_ROOT)/quickassist/include/lac \
+-               -I$(ICP_ROOT)/quickassist/lookaside/access_layer/include
++CFLAGS += -I$(ICP_LAC_API_DIR)
+ 
+ # From CRF 1.2 driver, library was renamed to libicp_qa_al.a
+ ifneq ($(wildcard $(ICP_ROOT)/build/icp_qa_al.a),)
+ ICP_LIBRARY_PATH = $(ICP_ROOT)/build/icp_qa_al.a
+ else
+-ICP_LIBRARY_PATH = $(ICP_ROOT)/build/libicp_qa_al.a
++ICP_LIBRARY_PATH = $(ICP_LIB_ROOT)/libicp_qa_al.a
+ endif
+ 
+-LDLIBS += -L$(ICP_ROOT)/build
+ LDLIBS += $(ICP_LIBRARY_PATH) \
+                 -lz \
+                 -losal \
+-- 
+1.7.9.5
+
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-dpdk-enable-build-config-VHOST-in-common_linuxapp-config.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-dpdk-enable-build-config-VHOST-in-common_linuxapp-config.patch
deleted file mode 100644
index e8ded8d0..00000000
--- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-1.8.0-dpdk-enable-build-config-VHOST-in-common_linuxapp-config.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From c1a59d62f2aa7656060d8ebcc8e45e852d931ff1 Mon Sep 17 00:00:00 2001
-From: Ong Boon Leong <boon.leong.ong@intel.com>
-Date: Tue, 17 Feb 2015 00:23:12 +0800
-Subject: [PATCH] dpdk: enable VHOST build config in common_linuxapp config
-
-Introduce CONFIG_VHOST_ENABLED for package config selection purpose in
-building vhost feature.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
----
- config/common_linuxapp |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/config/common_linuxapp b/config/common_linuxapp
-index 2f9643b..67f5edb 100644
---- a/config/common_linuxapp
-+++ b/config/common_linuxapp
-@@ -361,9 +361,9 @@ CONFIG_RTE_LIBRTE_PIPELINE=y
- #
- CONFIG_RTE_LIBRTE_KNI=y
- CONFIG_RTE_KNI_KO_DEBUG=n
--CONFIG_RTE_KNI_VHOST=n
-+CONFIG_RTE_KNI_VHOST=$(CONFIG_VHOST_ENABLED)
- CONFIG_RTE_KNI_VHOST_MAX_CACHE_SIZE=1024
--CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=n
-+CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=$(CONFIG_VHOST_ENABLED)
- CONFIG_RTE_KNI_VHOST_DEBUG_RX=n
- CONFIG_RTE_KNI_VHOST_DEBUG_TX=n
- 
-@@ -372,7 +372,7 @@ CONFIG_RTE_KNI_VHOST_DEBUG_TX=n
- # fuse-devel is needed to run vhost.
- # fuse-devel enables user space char driver development
- #
--CONFIG_RTE_LIBRTE_VHOST=n
-+CONFIG_RTE_LIBRTE_VHOST=$(CONFIG_VHOST_ENABLED)
- CONFIG_RTE_LIBRTE_VHOST_DEBUG=n
- 
- #
--- 
-1.7.9.5
-
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.0.0-dpdk-enable-VHOST-and-ip_fragmentation-in-common_linuxapp.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.0.0-dpdk-enable-VHOST-and-ip_fragmentation-in-common_linuxapp.patch
deleted file mode 100644
index 45ce5e05..00000000
--- a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.0.0-dpdk-enable-VHOST-and-ip_fragmentation-in-common_linuxapp.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 3d3c03d947394696565b3bb7bed8c900de057a28 Mon Sep 17 00:00:00 2001
-From: WU CHIA CHUAN <chia.chuan.wu@intel.com>
-Date: Thu, 2 Jul 2015 15:59:18 +0800
-Subject: [PATCH] dpdk enable VHOST and ip_fragmentation in common_linuxapp config
-
-Introduce CONFIG_VHOST_ENABLED for package config selection purpose in
-building vhost feature.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: WU CHIA CHUAN <chia.chuan.wu@intel.com>
----
- config/common_linuxapp |   11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/config/common_linuxapp b/config/common_linuxapp
-index 0b25f34..000f950 100644
---- a/config/common_linuxapp
-+++ b/config/common_linuxapp
-@@ -406,19 +406,24 @@ CONFIG_RTE_LIBRTE_PIPELINE=y
- CONFIG_RTE_LIBRTE_KNI=y
- CONFIG_RTE_KNI_PREEMPT_DEFAULT=y
- CONFIG_RTE_KNI_KO_DEBUG=n
--CONFIG_RTE_KNI_VHOST=n
-+CONFIG_RTE_KNI_VHOST=$(CONFIG_VHOST_ENABLED)
- CONFIG_RTE_KNI_VHOST_MAX_CACHE_SIZE=1024
--CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=n
-+CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=$(CONFIG_VHOST_ENABLED)
- CONFIG_RTE_KNI_VHOST_DEBUG_RX=n
- CONFIG_RTE_KNI_VHOST_DEBUG_TX=n
- 
- #
-+# Compile ip_fragmentation
-+#
-+CONFIG_RTE_IP_FRAG=y
-+
-+#
- # Compile vhost library
- # fuse-devel is needed to run vhost-cuse.
- # fuse-devel enables user space char driver development
- # vhost-user is turned on by default.
- #
--CONFIG_RTE_LIBRTE_VHOST=n
-+CONFIG_RTE_LIBRTE_VHOST=$(CONFIG_VHOST_ENABLED)
- CONFIG_RTE_LIBRTE_VHOST_USER=y
- CONFIG_RTE_LIBRTE_VHOST_DEBUG=n
- 
--- 
-1.7.9.5
-
diff --git a/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.0.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.0.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch
new file mode 100644
index 00000000..c4c683e8
--- /dev/null
+++ b/meta-isg/common/recipes-extended/dpdk/dpdk/dpdk-2.0.0-dpdk-enable-ip_fragmentation-in-common_linuxapp.patch
@@ -0,0 +1,31 @@
+From ebf07e9708c96aa1e655127175c39ad6ae3fc5ae Mon Sep 17 00:00:00 2001
+From: WU CHIA CHUAN <chia.chuan.wu@intel.com>
+Date: Tue, 28 Jul 2015 13:12:21 +0800
+Subject: [PATCH] dpdk enable ip_fragmentation in common_linuxapp config
+
+Upstream-Status: Inappropriate [Configuration]
+
+Signed-off-by: WU CHIA CHUAN <chia.chuan.wu@intel.com>
+---
+ config/common_linuxapp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/config/common_linuxapp b/config/common_linuxapp
+index 0b25f34..8cd97d7 100644
+--- a/config/common_linuxapp
++++ b/config/common_linuxapp
+@@ -354,6 +354,11 @@ CONFIG_RTE_MAX_LCORE_FREQS=64
+ CONFIG_RTE_LIBRTE_NET=y
+ 
+ #
++# Compile ip_fragmentation
++#
++CONFIG_RTE_IP_FRAG=y
++
++#
+ # Compile librte_ip_frag
+ #
+ CONFIG_RTE_LIBRTE_IP_FRAG=y
+-- 
+1.9.1
+