summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Nita <george.nita@enea.com>2015-09-23 03:11:59 (GMT)
committerGeorge Nita <george.nita@enea.com>2015-09-23 03:11:59 (GMT)
commitd0b8c49aa0e1e21abb716c52be09ef41c4fffbc6 (patch)
tree7fc7b4d4407b9e015f8e65d82777dd6cccd6d590
parent3ab7b40622ac62f2e8876adabfbfbcb80e62bb2e (diff)
parentbd1e3db669dfdd6b3bcb51ee8b05601adb9cf277 (diff)
downloadmeta-intel-d0b8c49aa0e1e21abb716c52be09ef41c4fffbc6.tar.gz
Merge remote-tracking branch 'origin/master' into master-enea
-rw-r--r--common/recipes-kernel/linux/linux-yocto_4.1.bbappend12
-rw-r--r--conf/machine/include/intel-quark-common.inc6
-rw-r--r--meta-isg/common/recipes-extended/qat/qat16.inc117
-rw-r--r--meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch30
-rw-r--r--meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-replace-strict_strtoull-with-kstrtoull.patch40
-rw-r--r--meta-isg/common/recipes-extended/qat/qat16/qat16_2.5.0-80-qat-add-install-target-to-makefiles.patch387
-rw-r--r--meta-isg/common/recipes-extended/qat/qat16_2.3.0-34.bb118
-rw-r--r--meta-isg/common/recipes-extended/qat/qat16_2.5.0-80.bb11
-rw-r--r--meta-isg/common/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb2
9 files changed, 601 insertions, 122 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend
index f248b31..bb78989 100644
--- a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend
+++ b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend
@@ -6,16 +6,16 @@ LINUX_VERSION_core2-32-intel-common = "4.1.6"
6COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" 6COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}"
7KMACHINE_core2-32-intel-common = "intel-core2-32" 7KMACHINE_core2-32-intel-common = "intel-core2-32"
8KBRANCH_core2-32-intel-common = "standard/base" 8KBRANCH_core2-32-intel-common = "standard/base"
9SRCREV_meta_core2-32-intel-common ?= "429f9e2ff0649b8c9341345622545d874d5e303a" 9SRCREV_meta_core2-32-intel-common ?= "f674c39cffb3d05c1a8ba4a49418c39add0d57d7"
10SRCREV_machine_core2-32-intel-common ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e" 10SRCREV_machine_core2-32-intel-common ?= "87df2e93ed65bf0daaeabeb5c9bcdd7b48cc2ef4"
11KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 11KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
12 12
13LINUX_VERSION_corei7-64-intel-common = "4.1.6" 13LINUX_VERSION_corei7-64-intel-common = "4.1.6"
14COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" 14COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}"
15KMACHINE_corei7-64-intel-common = "intel-corei7-64" 15KMACHINE_corei7-64-intel-common = "intel-corei7-64"
16KBRANCH_corei7-64-intel-common = "standard/base" 16KBRANCH_corei7-64-intel-common = "standard/base"
17SRCREV_meta_corei7-64-intel-common ?= "429f9e2ff0649b8c9341345622545d874d5e303a" 17SRCREV_meta_corei7-64-intel-common ?= "f674c39cffb3d05c1a8ba4a49418c39add0d57d7"
18SRCREV_machine_corei7-64-intel-common ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e" 18SRCREV_machine_corei7-64-intel-common ?= "87df2e93ed65bf0daaeabeb5c9bcdd7b48cc2ef4"
19KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" 19KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}"
20 20
21# Quark / X1000 BSP Info 21# Quark / X1000 BSP Info
@@ -23,8 +23,8 @@ LINUX_VERSION_i586-nlp-32-intel-common = "4.1.6"
23COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" 23COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}"
24KMACHINE_i586-nlp-32-intel-common = "intel-quark" 24KMACHINE_i586-nlp-32-intel-common = "intel-quark"
25KBRANCH_i586-nlp-32-intel-common = "standard/base" 25KBRANCH_i586-nlp-32-intel-common = "standard/base"
26SRCREV_meta_i586-nlp-32-intel-common ?= "429f9e2ff0649b8c9341345622545d874d5e303a" 26SRCREV_meta_i586-nlp-32-intel-common ?= "f674c39cffb3d05c1a8ba4a49418c39add0d57d7"
27SRCREV_machine_i586-nlp-32-intel-common ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e" 27SRCREV_machine_i586-nlp-32-intel-common ?= "87df2e93ed65bf0daaeabeb5c9bcdd7b48cc2ef4"
28KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" 28KERNEL_FEATURES_append_i586-nlp-32-intel-common = ""
29 29
30 30
diff --git a/conf/machine/include/intel-quark-common.inc b/conf/machine/include/intel-quark-common.inc
index e2d34d7..ac518be 100644
--- a/conf/machine/include/intel-quark-common.inc
+++ b/conf/machine/include/intel-quark-common.inc
@@ -1,7 +1,11 @@
1# 1#
2# Common configuration for all MACHINES of the intel-corei7-64 type 2# Common configuration for all MACHINES of the intel-quark type
3# 3#
4 4
5DEFAULTTUNE ?= "i586-nlp-32" 5DEFAULTTUNE ?= "i586-nlp-32"
6require conf/machine/include/tune-i586-nlp.inc 6require conf/machine/include/tune-i586-nlp.inc
7require conf/machine/include/x86-base.inc 7require conf/machine/include/x86-base.inc
8
9# gnutls padlock code uses CMOV instruction in assembly which
10# is not valid for Quark.
11EXTRA_OECONF_append_pn-gnutls_intel-quark = " --disable-padlock"
diff --git a/meta-isg/common/recipes-extended/qat/qat16.inc b/meta-isg/common/recipes-extended/qat/qat16.inc
new file mode 100644
index 0000000..90765ea
--- /dev/null
+++ b/meta-isg/common/recipes-extended/qat/qat16.inc
@@ -0,0 +1,117 @@
1DESCRIPTION = "Intel(r) QuickAssist Technology API"
2HOMEPAGE = "https://01.org/packet-processing/intel%C2%AE-quickassist-technology-drivers-and-patches"
3
4#Dual BSD and GPLv2 License
5LICENSE = "BSD & GPLv2"
6LIC_FILES_CHKSUM = "\
7 file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
8 file://${COMMON_LICENSE_DIR}/BSD;md5=3775480a712fc46a69647678acb234cb \
9 "
10
11DEPENDS += "zlib openssl"
12PROVIDES += "virtual/qat"
13
14SRC_URI="https://01.org/sites/default/files/page/qatmux.l.${PV}.tgz;name=qat \
15 file://qat16_2.3.0-34-qat-fix-for-cross-compilation-issue.patch \
16 file://qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch \
17 file://qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch \
18 "
19
20COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64"
21
22S = "${WORKDIR}/${ICP_DRIVER_TYPE}"
23ICP_TOOLS = "accelcomp"
24SAMPLE_CODE_DIR = "${S}/quickassist/lookaside/access_layer/src/sample_code"
25
26export ICP_DRIVER_TYPE = "QAT1.6"
27export ICP_FIRMWARE_DIR="dh895xcc"
28export ICP_ROOT = "${S}"
29export ICP_ENV_DIR = "${S}/quickassist/build_system/build_files/env_files"
30export ICP_BUILDSYSTEM_PATH = "${S}/quickassist/build_system"
31export ICP_TOOLS_TARGET = "${ICP_TOOLS}"
32export FUNC_PATH = "${ICP_ROOT}/quickassist/lookaside/access_layer/src/sample_code/functional"
33export KERNEL_SOURCE_ROOT = "${STAGING_KERNEL_DIR}"
34export ICP_BUILD_OUTPUT = "${D}"
35export DEST_LIBDIR = "${libdir}"
36export DEST_BINDIR = "${bindir}"
37export QAT_KERNEL_VER = "${KERNEL_VERSION}"
38export SAMPLE_BUILD_OUTPUT = "${D}"
39export MODULE_DIR = "${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers"
40
41inherit module
42inherit update-rc.d
43INITSCRIPT_NAME = "qat_service"
44
45PARALLEL_MAKE = ""
46
47#To get around the double slashes in paths in QAT makefiles
48PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
49
50EXTRA_OEMAKE_append = " CFLAGS+=-fgnu89-inline"
51
52do_unpack2() {
53 cd ${S}/
54 tar xzvf ${ICP_DRIVER_TYPE}.L.${PV}.tar.gz
55}
56
57addtask unpack2 after do_unpack before do_patch
58
59do_compile () {
60 export LD="${LD} --hash-style=gnu"
61 export MACHINE="${TARGET_ARCH}"
62 cd ${S}/quickassist
63 oe_runmake EXTRA_OEMAKE="'CFLAGS=${CFLAGS} -fPIC'"
64
65 cd ${SAMPLE_CODE_DIR}
66 touch ${SAMPLE_CODE_DIR}/performance/compression/calgary
67 touch ${SAMPLE_CODE_DIR}/performance/compression/canterbury
68
69 #build the whole sample code: fips, functional, performance
70 oe_runmake 'all'
71 oe_runmake 'fips_user_code'
72}
73
74do_install() {
75 cd ${S}/quickassist
76 oe_runmake install
77
78 cd ${SAMPLE_CODE_DIR}
79 oe_runmake install
80
81 install -d ${D}/etc/udev/rules.d \
82 ${D}${includedir} \
83 ${D}${includedir}/dc \
84 ${D}${includedir}/lac \
85 ${D}${sysconfdir}/dh895xcc \
86 ${D}${base_libdir}/firmware
87
88 echo 'KERNEL=="icp_adf_ctl" MODE="0600"' > ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules
89 echo 'KERNEL=="icp_dev[0-9]*" MODE="0600"' >> ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules
90 echo 'KERNEL=="icp_dev_mem?" MODE="0600"' >> ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules
91
92 install -m 640 ${S}/quickassist/include/*.h ${D}${includedir}
93 install -m 640 ${S}/quickassist/include/dc/*.h ${D}${includedir}/dc/
94 install -m 640 ${S}/quickassist/include/lac/*.h ${D}${includedir}/lac/
95 install -m 640 ${S}/quickassist/lookaside/access_layer/include/*.h ${D}${includedir}
96
97 install -m 0755 ${SAMPLE_CODE_DIR}/performance/compression/calgary ${D}${base_libdir}/firmware
98 install -m 0755 ${SAMPLE_CODE_DIR}/performance/compression/canterbury ${D}${base_libdir}/firmware
99
100 install -m 660 ${S}/quickassist/config/dh* ${D}${sysconfdir}/dh895xcc
101}
102
103PACKAGES += "${PN}-app"
104
105FILES_${PN}-dev = "${includedir}"
106
107FILES_${PN} += "\
108 ${base_libdir}/firmware/ \
109 ${sysconfdir}/ \
110 ${sysconfdir}/udev/rules.d/ \
111 ${sysconfdir}/init.d/ \
112 ${libdir}/ \
113 "
114
115FILES_${PN}-dbg += "${sysconfdir}/init.d/.debug"
116
117FILES_${PN}-app += "${bindir}/*"
diff --git a/meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch b/meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch
new file mode 100644
index 0000000..e1ed3fc
--- /dev/null
+++ b/meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch
@@ -0,0 +1,30 @@
1From 83f465ee776868875f6c19c2110eed4db6c547ce Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anujx.mittal@intel.com>
3Date: Thu, 10 Sep 2015 11:58:44 +0800
4Subject: [PATCH] qat: make sure CFLAGS are correct
5
6Upstream-Status: Submitted
7
8Ensure that all the CFLAGS values are being considered.
9
10Signed-off-by: Anuj Mittal <anujx.mittal@intel.com>
11---
12 quickassist/adf/user/user_proxy/src/Makefile | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/quickassist/adf/user/user_proxy/src/Makefile b/quickassist/adf/user/user_proxy/src/Makefile
16index 868313a..efd352c 100644
17--- a/quickassist/adf/user/user_proxy/src/Makefile
18+++ b/quickassist/adf/user/user_proxy/src/Makefile
19@@ -133,7 +133,7 @@ INCLUDES+= -I$(ADF_DIR)/include \
20 -I$(ADF_PLATFORM_DIR)/include \
21 -I$(ADF_CTL_DIR)/include
22
23-CFLAGS = -D_GNU_SOURCE -O2 $(INCLUDES)
24+CFLAGS += -D_GNU_SOURCE -O2 $(INCLUDES)
25 #needed by SAL
26 EXTRA_CFLAGS += -fPIC -fno-strict-aliasing
27 #include your $(ICP_OS)_$(ICP_OS_LEVEL).mk file
28--
291.7.9.5
30
diff --git a/meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-replace-strict_strtoull-with-kstrtoull.patch b/meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-replace-strict_strtoull-with-kstrtoull.patch
new file mode 100644
index 0000000..dee1f71
--- /dev/null
+++ b/meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-replace-strict_strtoull-with-kstrtoull.patch
@@ -0,0 +1,40 @@
1From 4ef0e0124f73b3bc24b2f2a772d83176aaa9fb3f Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anujx.mittal@intel.com>
3Date: Tue, 8 Sep 2015 11:53:36 +0800
4Subject: [PATCH] qat: replace strict_strtoull with kstrtoull
5
6Upstream-Status: Backport
7
8strict_strtoull() has been removed starting kernel v3.18.
9Hence, replace the usage with kstrtoull().
10
11Signed-off-by: Anuj Mittal <anujx.mittal@intel.com>
12---
13 .../uclo/include/linux/uclo_platform.h | 4 ++++
14 1 file changed, 4 insertions(+)
15
16diff --git a/quickassist/utilities/downloader/Target_CoreLibs/uclo/include/linux/uclo_platform.h b/quickassist/utilities/downloader/Target_CoreLibs/uclo/include/linux/uclo_platform.h
17index a4bf903..ee3e2d8 100755
18--- a/quickassist/utilities/downloader/Target_CoreLibs/uclo/include/linux/uclo_platform.h
19+++ b/quickassist/utilities/downloader/Target_CoreLibs/uclo/include/linux/uclo_platform.h
20@@ -116,6 +116,9 @@
21 /* 32-bit/64-bit 2.6.29 kernel does not export simple_strtoll */
22 #define STR_TO_32(str, base, num, endPtr) {*(num) = (int)simple_strtol((str), &(endPtr), (base));}
23
24+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
25+#define STR_TO_64(str, base, num, endPtr) {endPtr=NULL; if (kstrtoull((str), (base), (num))) printk("Error strtoull convert %s\n", str); }
26+#else
27 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
28 #define STR_TO_64(str, base, num, endPtr) {endPtr=NULL; if (strict_strtoull((str), (base), (num))) printk("Error strtoull convert %s\n", str); }
29 #else
30@@ -133,6 +136,7 @@
31 } while(0)
32 #endif
33 #endif
34+#endif
35
36 int aToi(const char *pStr);
37
38--
391.7.9.5
40
diff --git a/meta-isg/common/recipes-extended/qat/qat16/qat16_2.5.0-80-qat-add-install-target-to-makefiles.patch b/meta-isg/common/recipes-extended/qat/qat16/qat16_2.5.0-80-qat-add-install-target-to-makefiles.patch
new file mode 100644
index 0000000..927389f
--- /dev/null
+++ b/meta-isg/common/recipes-extended/qat/qat16/qat16_2.5.0-80-qat-add-install-target-to-makefiles.patch
@@ -0,0 +1,387 @@
1From 803fd66d6a7e6dccc420f925106da0f05766a2f6 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anujx.mittal@intel.com>
3Date: Wed, 9 Sep 2015 16:58:55 +0800
4Subject: [PATCH] qat: add-install-target-to-makefiles
5
6Upstream-Status: Inappropriate [Configuration]
7
8Add install target to makefile to help install
9ingredients at the proper location.
10
11Signed-off-by: Anuj Mittal <anujx.mittal@intel.com>
12---
13 quickassist/Makefile | 36 ++++++----
14 .../access_layer/src/sample_code/Makefile | 18 +++--
15 .../src/sample_code/functional/Makefile | 73 +++++++++++---------
16 3 files changed, 73 insertions(+), 54 deletions(-)
17
18diff --git a/quickassist/Makefile b/quickassist/Makefile
19index 339d410..b23a409 100644
20--- a/quickassist/Makefile
21+++ b/quickassist/Makefile
22@@ -108,7 +108,7 @@ export DRBG_POLL_AND_WAIT=1
23 ifdef WITH_CPA_MUX
24 ALL_TARGETS = clean lac_lib_dir libosal libosal_user qat_mux hal adf adf_user lac lac_user qat-fw install_scripts
25 else
26-ALL_TARGETS = clean lac_lib_dir libosal libosal_user hal adf adf_user lac lac_user qat-fw install_scripts
27+ALL_TARGETS = clean lac_lib_dir libosal libosal_user hal adf adf_user lac lac_user
28 endif
29 ICP_ARCH_USER?=`uname -m`
30
31@@ -120,7 +120,16 @@ all: $(ALL_TARGETS)
32 @echo 'Build Done';
33
34 user: lac_lib_dir libosal_user adf_user lac_user
35-kernel: lac_lib_dir libosal hal adf lac qat-fw install_scripts
36+kernel: lac_lib_dir libosal hal adf lac qat-fw
37+
38+install: qat-fw install_scripts
39+ @cp $(OSAL_PATH)/src/build/linux_2.6/user_space/libosal.a $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR);
40+ @cp $(OSAL_PATH)/src/build/linux_2.6/user_space/libosal.a $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR);
41+ @cp $(ADF_PATH)/build/linux_2.6/libadf_proxy.a $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR);
42+ @cp $(ADF_PATH)/build/linux_2.6/adf_ctl $(ICP_BUILD_OUTPUT)/etc/init.d/;
43+ @cp $(LAC_PATH)/src/build/linux_2.6/kernel_space/$(DRIVER) $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers;
44+ @cp $(LAC_PATH)/src/build/linux_2.6/user_space/lib$(BASENAME).a $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR);
45+ @cp $(LAC_PATH)/src/build/linux_2.6/user_space/lib$(BASENAME)_s.so $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR);
46
47 install_scripts:
48 @echo ; echo 'Copying Install Scripts';
49@@ -128,10 +137,10 @@ ifdef WITH_CPA_MUX
50 @cp $(ICP_BUILDSYSTEM_PATH)/build_files/qat_service_mux $(ICP_BUILD_OUTPUT)/qat_service;
51 endif
52 ifndef WITH_CPA_MUX
53- @cp $(ICP_BUILDSYSTEM_PATH)/build_files/qat_service $(ICP_BUILD_OUTPUT)/;
54+ @cp $(ICP_BUILDSYSTEM_PATH)/build_files/qat_service $(ICP_BUILD_OUTPUT)/etc/init.d;
55 endif
56- @chmod 750 $(ICP_BUILD_OUTPUT)/qat_service;
57- @cp $(CONFIG_PATH)/dh895xcc_qa_dev0.conf $(ICP_BUILD_OUTPUT)/;
58+ @chmod 750 $(ICP_BUILD_OUTPUT)/etc/init.d/qat_service;
59+ @cp $(CONFIG_PATH)/dh895xcc_qa_dev0.conf $(ICP_BUILD_OUTPUT)/etc/;
60 # @cp $(CONFIG_PATH)/dh89xxcc_qa_dev1.conf $(ICP_BUILD_OUTPUT)/;
61 # @cp $(CONFIG_PATH)/dh89xxcc_qa_dev0_single_accel.conf $(ICP_BUILD_OUTPUT)/;
62
63@@ -150,7 +159,6 @@ libosal_user: output_dir lac_lib_dir
64 @echo ; echo 'Building OSAL for user space';
65 @cd $(OSAL_PATH)/src && $(MAKE) ARCH=$(ICP_ARCH_USER) ICP_ENV_DIR=$(ICP_TOP_ENV) OS_LEVEL=linux ICP_OS_LEVEL=user_space lib;\
66 echo ; echo 'Copying OSAL library';
67- cp $(OSAL_PATH)/src/build/linux_2.6/user_space/libosal.a $(ICP_BUILD_OUTPUT)/;
68
69 hal: output_dir libosal
70 @echo ; echo 'Building Hal Libs';
71@@ -175,7 +183,6 @@ libosal_uservf: output_dir lac_lib_dir
72 @echo ; echo 'Building OSAL for user space';
73 @cd $(OSAL_PATH)/src && export ICP_WITHOUT_IOMMU=1 && $(MAKE) ICP_ENV_DIR=$(ICP_TOP_ENV) OS_LEVEL=linux ICP_OS_LEVEL=user_space lib;\
74 echo ; echo 'Copying OSAL library';
75- cp $(OSAL_PATH)/src/build/linux_2.6/user_space/libosal.a $(ICP_BUILD_OUTPUT)/;
76
77 adfvf: output_dir lac_lib_dir libosalvf
78 @echo ; echo 'Building ADFVF';
79@@ -185,13 +192,10 @@ adfvf: output_dir lac_lib_dir libosalvf
80 adf_user: output_dir lac_lib_dir libosal_user
81 @echo ; echo 'Building user ADF';
82 @cd $(ADF_PATH) && export ADF_PLATFORM=ACCELDEV && export ICP_ENV_DIR=$(ICP_TOP_ENV) && export ONE_KO_RELEASE_PACKAGE=1 && ICP_OS_LEVEL=user_space && $(MAKE) ARCH=$(ICP_ARCH_USER) adf_user;
83- cp $(ADF_PATH)/build/linux_2.6/libadf_proxy.a $(ICP_BUILD_OUTPUT)/;
84- cp $(ADF_PATH)/build/linux_2.6/adf_ctl $(ICP_BUILD_OUTPUT)/;
85
86 lac: output_dir libosal hal adf
87 @echo ; echo 'Building LAC';
88 @cd $(LAC_PATH) && export ICP_ENV_DIR=$(ICP_TOP_ENV) && export ONE_KO_RELEASE_PACKAGE=1 && cd src && $(MAKE) ICP_OS_LEVEL=kernel_space OS_LEVEL=linux;
89- @cp $(LAC_PATH)/src/build/linux_2.6/kernel_space/$(DRIVER) $(ICP_BUILD_OUTPUT)/;
90
91 lacvf: output_dir libosalvf adfvf
92 @echo ; echo 'Building LACVF';
93@@ -199,20 +203,18 @@ ifdef WITH_CPA_MUX
94 @cp $(CPA_MUX_PATH)/Module.symvers $(LAC_PATH)/src/
95 endif
96 @cd $(LAC_PATH) && export ADF_PLATFORM=ACCELDEVVF && export ICP_ENV_DIR=$(ICP_TOP_ENV) && export ONE_KO_RELEASE_PACKAGE=1 && cd src && $(MAKE) ICP_OS_LEVEL=kernel_space OS_LEVEL=linux;
97- @cp $(LAC_PATH)/src/build/linux_2.6/kernel_space/$(BASENAME)_vf.ko $(ICP_BUILD_OUTPUT)/;
98
99 lac_user: output_dir libosal_user adf_user
100 @echo ; echo 'Building LAC in user space';
101 @cd $(LAC_PATH) && export ICP_ENV_DIR=$(ICP_TOP_ENV) && export ONE_KO_RELEASE_PACKAGE=1 && cd src && $(MAKE) ARCH=$(ICP_ARCH_USER) lib_static ICP_OS_LEVEL=user_space;
102- cp $(LAC_PATH)/src/build/linux_2.6/user_space/lib$(BASENAME).a $(ICP_BUILD_OUTPUT)/;
103 @cd $(LAC_PATH) && export ICP_ENV_DIR=$(ICP_TOP_ENV) && export ONE_KO_RELEASE_PACKAGE=1 && cd src && $(MAKE) ARCH=$(ICP_ARCH_USER) lib_shared ICP_OS_LEVEL=user_space;
104- cp $(LAC_PATH)/src/build/linux_2.6/user_space/lib$(BASENAME)_s.so $(ICP_BUILD_OUTPUT)/;
105+ cp $(LAC_PATH)/src/build/linux_2.6/user_space/lib$(BASENAME)_s.so $(ICP_BUILD_OUTPUT);
106
107 qat-fw: output_dir
108 @echo ; echo 'Copying QAT-FW Binary';
109- @cp -f $(QAT_FW_PATH)/icp_qat_ae.mof $(ICP_BUILD_OUTPUT)/mof_firmware.bin;
110+ @cp -f $(QAT_FW_PATH)/icp_qat_ae.mof $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR)/mof_firmware.bin;
111 @echo ; echo 'Copying MMP Binary';
112- @cp -f $(QAT_FW_PATH)/icp_qat_pke.mof $(ICP_BUILD_OUTPUT)/mmp_firmware.bin;
113+ @cp -f $(QAT_FW_PATH)/icp_qat_pke.mof $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR)/mmp_firmware.bin;
114
115 qat_mux: output_dir libosal
116 @echo ; echo 'Building qat_mux module'
117@@ -248,6 +250,10 @@ endif
118
119 output_dir:
120 test -d $(ICP_BUILD_OUTPUT) || mkdir -p $(ICP_BUILD_OUTPUT);
121+ test -d $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR) || mkdir -p $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR);
122+ test -d $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR) || mkdir -p $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR);
123+ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers;
124+ test -d $(ICP_BUILD_OUTPUT)/etc/init.d || mkdir -p $(ICP_BUILD_OUTPUT)/etc/init.d;
125
126 lac_lib_dir:
127 test -d $(LAC_LIB_DIR) || mkdir -p $(LAC_LIB_DIR);
128diff --git a/quickassist/lookaside/access_layer/src/sample_code/Makefile b/quickassist/lookaside/access_layer/src/sample_code/Makefile
129index e13bbf0..fbc575e 100644
130--- a/quickassist/lookaside/access_layer/src/sample_code/Makefile
131+++ b/quickassist/lookaside/access_layer/src/sample_code/Makefile
132@@ -95,6 +95,7 @@ SAMPLE_PATH?=$(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code
133 PERF_PATH?=$(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code/performance
134 FIPS_PATH?=$(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code/fips
135 FUNC_PATH=$(SAMPLE_PATH)/functional
136+FIPS_OUTPUT_NAME=fips_sample
137
138 #include the makefile with all the default and common Make variable definitions
139 include $(ICP_BUILDSYSTEM_PATH)/build_files/common.mk
140@@ -106,6 +107,8 @@ SAMPLE_BUILD_OUTPUT?=$(SAMPLE_PATH)/build
141
142 output_dir:
143 test -d $(SAMPLE_BUILD_OUTPUT) || mkdir $(SAMPLE_BUILD_OUTPUT);
144+ test -d $(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR) || mkdir -p $(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR)
145+
146 fips_code:
147 @if test -d $(FIPS_PATH); then echo ; echo 'Building FIPS Code'; fi;
148 @if test -d $(FIPS_PATH); \
149@@ -162,17 +165,13 @@ endif
150 perf_all: $(PERF_ALL)
151 @echo ; echo "Build output location $(SAMPLE_BUILD_OUTPUT)";
152
153-
154 perf_user: output_dir
155 @echo ; echo "Building perf_user";
156 @cd $(PERF_PATH) && $(MAKE) clean ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=user_space lib_shared exe
157- @cp $(PERF_PATH)/build/linux_2.6/user_space/$(PERF_OUTPUT_NAME)_s.so $(SAMPLE_BUILD_OUTPUT)/;
158- @cp $(PERF_PATH)/build/linux_2.6/user_space/$(PERF_OUTPUT_NAME) $(SAMPLE_BUILD_OUTPUT)/;
159
160 perf_kernel: output_dir
161 @echo ; echo "Building perf_kernel";
162 @cd $(PERF_PATH) && $(MAKE) ICP_OS_LEVEL=kernel_space
163- @cp $(PERF_PATH)/build/linux_2.6/$(ICP_OS_LEVEL)/$(PERF_OUTPUT_NAME).ko $(SAMPLE_BUILD_OUTPUT)/;
164
165 common_mem_drv_kernel: output_dir
166 @echo ; echo "Building common_mem_drv kernel space";
167@@ -187,12 +186,19 @@ common_mem_drv_user: output_dir
168 perf_qae: output_dir
169 @echo ; echo "Building perf_qae";
170 @cd $(CMN_ROOT)/linux/kernel_space && $(MAKE) ICP_OS_LEVEL=kernel_space
171- @cp $(CMN_ROOT)/linux/kernel_space/build/linux_2.6/$(ICP_OS_LEVEL)/$(CMN_MODULE_NAME).ko $(SAMPLE_BUILD_OUTPUT)/;
172-
173
174 func: output_dir
175 @cd $(FUNC_PATH) && $(MAKE) all;
176
177+install: output_dir
178+ @cp $(PERF_PATH)/build/linux_2.6/user_space/$(PERF_OUTPUT_NAME)_s.so $(SAMPLE_BUILD_OUTPUT)$(DEST_LIBDIR);
179+ @cp $(PERF_PATH)/build/linux_2.6/user_space/$(PERF_OUTPUT_NAME) $(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR);
180+ @cp $(PERF_PATH)/build/linux_2.6/$(ICP_OS_LEVEL)/$(PERF_OUTPUT_NAME).ko $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers;
181+ @cp $(CMN_ROOT)/linux/kernel_space/build/linux_2.6/$(ICP_OS_LEVEL)/$(CMN_MODULE_NAME).ko $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers;
182+ @cp $(FIPS_PATH)/build/linux_2.6/$(ICP_OS_LEVEL)/$(FIPS_OUTPUT_NAME).ko $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers;
183+ @cp $(FIPS_PATH)/build/linux_2.6/user_space/$(FIPS_OUTPUT_NAME)_s.so $(SAMPLE_BUILD_OUTPUT)$(DEST_LIBDIR);
184+ @cp $(FIPS_PATH)/build/linux_2.6/user_space/$(FIPS_OUTPUT_NAME).a $(SAMPLE_BUILD_OUTPUT)$(DEST_LIBDIR);
185+ @cd $(FUNC_PATH) && $(MAKE) install;
186
187 all: $(MEM_DRIVER) fips_code perf_user perf_kernel func
188 perf: $(MEM_DRIVER) perf_kernel
189diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile
190index 3625637..322622b 100644
191--- a/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile
192+++ b/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile
193@@ -64,6 +64,8 @@ SYM_PATH?=$(SAMPLE_PATH)/sym
194 ASYM_PATH?=$(SAMPLE_PATH)/asym
195 ICP_API_DIR?=$(ICP_ROOT)/quickassist/include/
196 ICP_LAC_DIR?=$(ICP_ROOT)/quickassist/lookaside/access_layer/
197+BIN_INSTALLPATH=$(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR)/
198+MODULE_INSTALLPATH=$(SAMPLE_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers
199
200 ifeq ($(WITH_CMDRV),1)
201 CMN_ROOT?=$(ICP_ROOT)/quickassist/utilities/libqae_mem/
202@@ -110,6 +112,7 @@ SAMPLE_BUILD_OUTPUT?=$(SAMPLE_PATH)/build
203
204 output_dir:
205 test -d $(SAMPLE_BUILD_OUTPUT) || mkdir $(SAMPLE_BUILD_OUTPUT);
206+ test -d $(BIN_INSTALLPATH) || mkdir -p $(BIN_INSTALLPATH);
207
208 BUILD_DC=dc_dp_sample stateless_sample stateful_sample \
209 stateless_multi_op_checksum_sample
210@@ -119,31 +122,23 @@ dc: $(BUILD_DC)
211
212 dc_dp_sample: output_dir
213 @cd $(DC_PATH)/dc_dp_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space
214- @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample $(SAMPLE_BUILD_OUTPUT)/;
215 ifneq ($(WITH_UPSTREAM),1)
216 @cd $(DC_PATH)/dc_dp_sample && $(MAKE) ICP_OS_LEVEL=kernel_space
217- @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample.ko $(SAMPLE_BUILD_OUTPUT)/;
218 endif
219
220 stateless_sample: output_dir
221 @cd $(DC_PATH)/stateless_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space
222- @cp $(DC_PATH)/stateless_sample/dc_stateless_sample $(SAMPLE_BUILD_OUTPUT)/;
223 ifneq ($(WITH_UPSTREAM),1)
224 @cd $(DC_PATH)/stateless_sample && $(MAKE) ICP_OS_LEVEL=kernel_space
225- @cp $(DC_PATH)/stateless_sample/dc_stateless_sample.ko $(SAMPLE_BUILD_OUTPUT)/;
226 endif
227
228 stateful_sample: output_dir
229 @cd $(DC_PATH)/stateful_sample && $(MAKE) clean ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=user_space
230- @cp $(DC_PATH)/stateful_sample/dc_stateful_sample $(SAMPLE_BUILD_OUTPUT)/;
231- @cp $(DC_PATH)/stateful_sample/paper4 $(SAMPLE_BUILD_OUTPUT)/;
232
233 stateless_multi_op_checksum_sample: output_dir
234 @cd $(DC_PATH)/stateless_multi_op_checksum_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space
235- @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample $(SAMPLE_BUILD_OUTPUT)/;
236 ifneq ($(WITH_UPSTREAM),1)
237 @cd $(DC_PATH)/stateless_multi_op_checksum_sample && $(MAKE) ICP_OS_LEVEL=kernel_space
238- @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample.ko $(SAMPLE_BUILD_OUTPUT)/;
239 endif
240
241 BUILD_SYN=algchaining_sample ccm_sample cipher_sample \
242@@ -159,86 +154,65 @@ sym:$(BUILD_SYN)
243 @echo ; echo "Build sym component";
244 algchaining_sample: output_dir
245 @cd $(SYM_PATH)/alg_chaining_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space
246- @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample $(SAMPLE_BUILD_OUTPUT)/;
247 ifneq ($(WITH_UPSTREAM),1)
248 @cd $(SYM_PATH)/alg_chaining_sample && $(MAKE) ICP_OS_LEVEL=kernel_space
249- @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample.ko $(SAMPLE_BUILD_OUTPUT)/;
250 endif
251
252 ccm_sample: output_dir
253 @cd $(SYM_PATH)/ccm_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space
254- @cp $(SYM_PATH)/ccm_sample/ccm_sample $(SAMPLE_BUILD_OUTPUT)/;
255 ifneq ($(WITH_UPSTREAM),1)
256 @cd $(SYM_PATH)/ccm_sample && $(MAKE) ICP_OS_LEVEL=kernel_space
257- @cp $(SYM_PATH)/ccm_sample/ccm_sample.ko $(SAMPLE_BUILD_OUTPUT)/;
258 endif
259
260 cipher_sample: output_dir
261 @cd $(SYM_PATH)/cipher_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space
262- @cp $(SYM_PATH)/cipher_sample/cipher_sample $(SAMPLE_BUILD_OUTPUT)/;
263 ifneq ($(WITH_UPSTREAM),1)
264 @cd $(SYM_PATH)/cipher_sample && $(MAKE) ICP_OS_LEVEL=kernel_space
265- @cp $(SYM_PATH)/cipher_sample/cipher_sample.ko $(SAMPLE_BUILD_OUTPUT)/;
266 endif
267
268 drbg_sample: output_dir
269 @cd $(SYM_PATH)/drbg_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space
270- @cp $(SYM_PATH)/drbg_sample/drbg_sample $(SAMPLE_BUILD_OUTPUT)/;
271 ifneq ($(WITH_UPSTREAM),1)
272 @cd $(SYM_PATH)/drbg_sample && $(MAKE) ICP_OS_LEVEL=kernel_space
273- @cp $(SYM_PATH)/drbg_sample/drbg_sample.ko $(SAMPLE_BUILD_OUTPUT)/;
274 endif
275
276 gcm_sample: output_dir
277 @cd $(SYM_PATH)/gcm_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space
278- @cp $(SYM_PATH)/gcm_sample/gcm_sample $(SAMPLE_BUILD_OUTPUT)/;
279 ifneq ($(WITH_UPSTREAM),1)
280 @cd $(SYM_PATH)/gcm_sample && $(MAKE) ICP_OS_LEVEL=kernel_space
281- @cp $(SYM_PATH)/gcm_sample/gcm_sample.ko $(SAMPLE_BUILD_OUTPUT)/;
282 endif
283
284 hash_file_sample: output_dir
285 @cd $(SYM_PATH)/hash_file_sample && $(MAKE) clean ICP_OS_LEVEL=user_space&& $(MAKE) ICP_OS_LEVEL=user_space
286- @cp $(SYM_PATH)/hash_file_sample/hash_file_sample $(SAMPLE_BUILD_OUTPUT)/;
287
288 hash_sample: output_dir
289 @cd $(SYM_PATH)/hash_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space
290- @cp $(SYM_PATH)/hash_sample/hash_sample $(SAMPLE_BUILD_OUTPUT)/;
291 ifneq ($(WITH_UPSTREAM),1)
292 @cd $(SYM_PATH)/hash_sample && $(MAKE) ICP_OS_LEVEL=kernel_space
293- @cp $(SYM_PATH)/hash_sample/hash_sample.ko $(SAMPLE_BUILD_OUTPUT)/;
294 endif
295
296 ipsec_sample: output_dir
297 @cd $(SYM_PATH)/ipsec_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space
298- @cp $(SYM_PATH)/ipsec_sample/ipsec_sample $(SAMPLE_BUILD_OUTPUT)/;
299 ifneq ($(WITH_UPSTREAM),1)
300 @cd $(SYM_PATH)/ipsec_sample && $(MAKE) ICP_OS_LEVEL=kernel_space
301- @cp $(SYM_PATH)/ipsec_sample/ipsec_sample.ko $(SAMPLE_BUILD_OUTPUT)/;
302 endif
303
304 nrbg_sample: output_dir
305 @cd $(SYM_PATH)/nrbg_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space
306- @cp $(SYM_PATH)/nrbg_sample/nrbg_sample $(SAMPLE_BUILD_OUTPUT)/;
307 ifneq ($(WITH_UPSTREAM),1)
308 @cd $(SYM_PATH)/nrbg_sample && $(MAKE) && $(MAKE) ICP_OS_LEVEL=kernel_space
309- @cp $(SYM_PATH)/nrbg_sample/nrbg_sample.ko $(SAMPLE_BUILD_OUTPUT)/;
310 endif
311
312 ssl_sample: output_dir
313 @cd $(SYM_PATH)/ssl_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space
314- @cp $(SYM_PATH)/ssl_sample/ssl_sample $(SAMPLE_BUILD_OUTPUT)/;
315 ifneq ($(WITH_UPSTREAM),1)
316 @cd $(SYM_PATH)/ssl_sample && $(MAKE) ICP_OS_LEVEL=kernel_space
317- @cp $(SYM_PATH)/ssl_sample/ssl_sample.ko $(SAMPLE_BUILD_OUTPUT)/;
318 endif
319
320 sym_dp_sample: output_dir
321 @cd $(SYM_PATH)/symdp_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space
322- @cp $(SYM_PATH)/symdp_sample/sym_dp_sample $(SAMPLE_BUILD_OUTPUT)/;
323 ifneq ($(WITH_UPSTREAM),1)
324 @cd $(SYM_PATH)/symdp_sample && $(MAKE) ICP_OS_LEVEL=kernel_space
325- @cp $(SYM_PATH)/symdp_sample/sym_dp_sample.ko $(SAMPLE_BUILD_OUTPUT)/;
326 endif
327
328 BUILD_ASYM=diffie_hellman_sample prime_sample
329@@ -248,18 +222,51 @@ asym: $(BUILD_ASYM)
330
331 diffie_hellman_sample: output_dir
332 @cd $(ASYM_PATH)/diffie_hellman_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space
333- @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample $(SAMPLE_BUILD_OUTPUT)/;
334 ifneq ($(WITH_UPSTREAM),1)
335 @cd $(ASYM_PATH)/diffie_hellman_sample && $(MAKE) ICP_OS_LEVEL=kernel_space
336- @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample.ko $(SAMPLE_BUILD_OUTPUT)/;
337 endif
338
339 prime_sample: output_dir
340 @cd $(ASYM_PATH)/prime_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space
341- @cp $(ASYM_PATH)/prime_sample/prime_sample $(SAMPLE_BUILD_OUTPUT)/;
342 ifneq ($(WITH_UPSTREAM),1)
343 @cd $(ASYM_PATH)/prime_sample && $(MAKE) ICP_OS_LEVEL=kernel_space
344- @cp $(ASYM_PATH)/prime_sample/prime_sample.ko $(SAMPLE_BUILD_OUTPUT)/;
345+endif
346+
347+install: output_dir
348+ @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample $(BIN_INSTALLPATH);
349+ @cp $(DC_PATH)/stateless_sample/dc_stateless_sample $(BIN_INSTALLPATH);
350+ @cp $(DC_PATH)/stateful_sample/dc_stateful_sample $(BIN_INSTALLPATH);
351+ @cp $(DC_PATH)/stateful_sample/paper4 $(BIN_INSTALLPATH);
352+ @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample $(BIN_INSTALLPATH);
353+ @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample $(BIN_INSTALLPATH);
354+ @cp $(SYM_PATH)/ccm_sample/ccm_sample $(BIN_INSTALLPATH);
355+ @cp $(SYM_PATH)/cipher_sample/cipher_sample $(BIN_INSTALLPATH);
356+ @cp $(SYM_PATH)/drbg_sample/drbg_sample $(BIN_INSTALLPATH);
357+ @cp $(SYM_PATH)/gcm_sample/gcm_sample $(BIN_INSTALLPATH);
358+ @cp $(SYM_PATH)/hash_file_sample/hash_file_sample $(BIN_INSTALLPATH);
359+ @cp $(SYM_PATH)/hash_sample/hash_sample $(BIN_INSTALLPATH);
360+ @cp $(SYM_PATH)/ipsec_sample/ipsec_sample $(BIN_INSTALLPATH);
361+ @cp $(SYM_PATH)/nrbg_sample/nrbg_sample $(BIN_INSTALLPATH);
362+ @cp $(SYM_PATH)/ssl_sample/ssl_sample $(BIN_INSTALLPATH);
363+ @cp $(SYM_PATH)/symdp_sample/sym_dp_sample $(BIN_INSTALLPATH);
364+ @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample $(BIN_INSTALLPATH);
365+ @cp $(ASYM_PATH)/prime_sample/prime_sample $(BIN_INSTALLPATH);
366+ifneq ($(WITH_UPSTREAM),1)
367+ @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample.ko $(MODULE_INSTALLPATH);
368+ @cp $(DC_PATH)/stateless_sample/dc_stateless_sample.ko $(MODULE_INSTALLPATH);
369+ @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample.ko $(MODULE_INSTALLPATH);
370+ @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample.ko $(MODULE_INSTALLPATH);
371+ @cp $(SYM_PATH)/ccm_sample/ccm_sample.ko $(MODULE_INSTALLPATH);
372+ @cp $(SYM_PATH)/cipher_sample/cipher_sample.ko $(MODULE_INSTALLPATH);
373+ @cp $(SYM_PATH)/drbg_sample/drbg_sample.ko $(MODULE_INSTALLPATH);
374+ @cp $(SYM_PATH)/gcm_sample/gcm_sample.ko $(MODULE_INSTALLPATH);
375+ @cp $(SYM_PATH)/hash_sample/hash_sample.ko $(MODULE_INSTALLPATH);
376+ @cp $(SYM_PATH)/ipsec_sample/ipsec_sample.ko $(MODULE_INSTALLPATH);
377+ @cp $(SYM_PATH)/nrbg_sample/nrbg_sample.ko $(MODULE_INSTALLPATH);
378+ @cp $(SYM_PATH)/ssl_sample/ssl_sample.ko $(MODULE_INSTALLPATH);
379+ @cp $(SYM_PATH)/symdp_sample/sym_dp_sample.ko $(MODULE_INSTALLPATH);
380+ @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample.ko $(MODULE_INSTALLPATH);
381+ @cp $(ASYM_PATH)/prime_sample/prime_sample.ko $(MODULE_INSTALLPATH);
382 endif
383
384 CLEAN_DC=clean_dc_dp_sample clean_stateless_sample \
385--
3861.7.9.5
387
diff --git a/meta-isg/common/recipes-extended/qat/qat16_2.3.0-34.bb b/meta-isg/common/recipes-extended/qat/qat16_2.3.0-34.bb
index 83ccbfb..d6e9af4 100644
--- a/meta-isg/common/recipes-extended/qat/qat16_2.3.0-34.bb
+++ b/meta-isg/common/recipes-extended/qat/qat16_2.3.0-34.bb
@@ -1,118 +1,8 @@
1DESCRIPTION = "Intel(r) QuickAssist Technology API" 1include qat16.inc
2HOMEPAGE = "https://01.org/packet-processing/intel%C2%AE-quickassist-technology-drivers-and-patches"
3 2
4#Dual BSD and GPLv2 License 3SRC_URI += "file://qat16_2.3.0-34-qat-add-install-target-to-makefiles.patch \
5LICENSE = "BSD & GPLv2" 4 file://qat16_2.3.0-34-qat-replace-strict_strtoull-with-kstrtoull.patch \
6LIC_FILES_CHKSUM = "\ 5 "
7 file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
8 file://${COMMON_LICENSE_DIR}/BSD;md5=3775480a712fc46a69647678acb234cb \
9 "
10PV = "2.3.0-34"
11DEPENDS += "zlib openssl"
12PROVIDES += "virtual/qat"
13
14SRC_URI="https://01.org/sites/default/files/page/qatmux.l.${PV}.tgz;name=qat \
15 file://qat16_2.3.0-34-qat-add-install-target-to-makefiles.patch \
16 file://qat16_2.3.0-34-qat-fix-for-cross-compilation-issue.patch \
17 file://qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch \
18 "
19 6
20SRC_URI[qat.md5sum] = "9614bf598bc8e7eedc8adb6d29109033" 7SRC_URI[qat.md5sum] = "9614bf598bc8e7eedc8adb6d29109033"
21SRC_URI[qat.sha256sum] = "1f9708de3c132258eaa488c82760f374b6b6838c85cafef2e8c61034fe0f7031" 8SRC_URI[qat.sha256sum] = "1f9708de3c132258eaa488c82760f374b6b6838c85cafef2e8c61034fe0f7031"
22
23COMPATIBLE_MACHINE = "crystalforest"
24
25S = "${WORKDIR}/${ICP_DRIVER_TYPE}"
26ICP_TOOLS = "accelcomp"
27SAMPLE_CODE_DIR = "${S}/quickassist/lookaside/access_layer/src/sample_code"
28
29export ICP_DRIVER_TYPE = "QAT1.6"
30export ICP_FIRMWARE_DIR="dh895xcc"
31export ICP_ROOT = "${S}"
32export ICP_ENV_DIR = "${S}/quickassist/build_system/build_files/env_files"
33export ICP_BUILDSYSTEM_PATH = "${S}/quickassist/build_system"
34export ICP_TOOLS_TARGET = "${ICP_TOOLS}"
35export FUNC_PATH = "${ICP_ROOT}/quickassist/lookaside/access_layer/src/sample_code/functional"
36export KERNEL_SOURCE_ROOT = "${STAGING_KERNEL_DIR}"
37export ICP_BUILD_OUTPUT = "${D}"
38export DEST_LIBDIR = "${libdir}"
39export DEST_BINDIR = "${bindir}"
40export QAT_KERNEL_VER = "${KERNEL_VERSION}"
41export SAMPLE_BUILD_OUTPUT = "${D}"
42export MODULE_DIR = "${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers"
43
44inherit module
45inherit update-rc.d
46INITSCRIPT_NAME = "qat_service"
47
48PARALLEL_MAKE = ""
49
50#To get around the double slashes in paths in QAT makefiles
51PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
52
53do_unpack2() {
54 cd ${S}/
55 tar xzvf ${ICP_DRIVER_TYPE}.L.${PV}.tar.gz
56}
57
58addtask unpack2 after do_unpack before do_patch
59
60do_compile () {
61 export LD="${LD} --hash-style=gnu"
62 export MACHINE="${TARGET_ARCH}"
63 cd ${S}/quickassist
64 oe_runmake EXTRA_OEMAKE="'CFLAGS=${CFLAGS} -fPIC'"
65
66 cd ${SAMPLE_CODE_DIR}
67 touch ${SAMPLE_CODE_DIR}/performance/compression/calgary
68 touch ${SAMPLE_CODE_DIR}/performance/compression/canterbury
69
70 #build the whole sample code: fips, functional, performance
71 oe_runmake 'all'
72 oe_runmake 'fips_user_code'
73}
74
75do_install() {
76 cd ${S}/quickassist
77 oe_runmake install
78
79 cd ${SAMPLE_CODE_DIR}
80 oe_runmake install
81
82 install -d ${D}/etc/udev/rules.d \
83 ${D}${includedir} \
84 ${D}${includedir}/dc \
85 ${D}${includedir}/lac \
86 ${D}${sysconfdir}/dh895xcc \
87 ${D}${base_libdir}/firmware
88
89 echo 'KERNEL=="icp_adf_ctl" MODE="0600"' > ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules
90 echo 'KERNEL=="icp_dev[0-9]*" MODE="0600"' >> ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules
91 echo 'KERNEL=="icp_dev_mem?" MODE="0600"' >> ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules
92
93 install -m 640 ${S}/quickassist/include/*.h ${D}${includedir}
94 install -m 640 ${S}/quickassist/include/dc/*.h ${D}${includedir}/dc/
95 install -m 640 ${S}/quickassist/include/lac/*.h ${D}${includedir}/lac/
96 install -m 640 ${S}/quickassist/lookaside/access_layer/include/*.h ${D}${includedir}
97
98 install -m 0755 ${SAMPLE_CODE_DIR}/performance/compression/calgary ${D}${base_libdir}/firmware
99 install -m 0755 ${SAMPLE_CODE_DIR}/performance/compression/canterbury ${D}${base_libdir}/firmware
100
101 install -m 660 ${S}/quickassist/config/dh* ${D}${sysconfdir}/dh895xcc
102}
103
104PACKAGES += "${PN}-app"
105
106FILES_${PN}-dev = "${includedir}"
107
108FILES_${PN} += "\
109 ${base_libdir}/firmware/ \
110 ${sysconfdir}/ \
111 ${sysconfdir}/udev/rules.d/ \
112 ${sysconfdir}/init.d/ \
113 ${libdir}/ \
114 "
115
116FILES_${PN}-dbg += "${sysconfdir}/init.d/.debug"
117
118FILES_${PN}-app += "${bindir}/*"
diff --git a/meta-isg/common/recipes-extended/qat/qat16_2.5.0-80.bb b/meta-isg/common/recipes-extended/qat/qat16_2.5.0-80.bb
new file mode 100644
index 0000000..d9cd666
--- /dev/null
+++ b/meta-isg/common/recipes-extended/qat/qat16_2.5.0-80.bb
@@ -0,0 +1,11 @@
1include qat16.inc
2
3SRC_URI += "file://qat16_2.5.0-80-qat-add-install-target-to-makefiles.patch \
4 "
5
6SRC_URI[qat.md5sum] = "e3c2ceeec7ed8b36d75682742caff81e"
7SRC_URI[qat.sha256sum] = "e9e47cd9cbd98c2ceac5cc31570e443680649be682068126df6d749120a3697d"
8
9do_install_append() {
10 install -m 0755 ${SAMPLE_CODE_DIR}/performance/compression/calgary32 ${D}${base_libdir}/firmware
11}
diff --git a/meta-isg/common/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb b/meta-isg/common/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb
index b3dc19c..83f2896 100644
--- a/meta-isg/common/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb
+++ b/meta-isg/common/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb
@@ -29,7 +29,7 @@ SRC_URI[zlib.sha256sum] = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166
29SRC_URI[zlibqat.md5sum] = "dfde8618198aa8d35ecc00d10dcc7000" 29SRC_URI[zlibqat.md5sum] = "dfde8618198aa8d35ecc00d10dcc7000"
30SRC_URI[zlibqat.sha256sum] = "8e5786400bbc2a879ae705c864ec63b53ae019b4f2d1c94524a97223847b6e46" 30SRC_URI[zlibqat.sha256sum] = "8e5786400bbc2a879ae705c864ec63b53ae019b4f2d1c94524a97223847b6e46"
31 31
32COMPATIBLE_MACHINE = "crystalforest" 32COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64"
33 33
34ZLIB_VERSION = "1.2.8" 34ZLIB_VERSION = "1.2.8"
35ZLIB_QAT_VERSION = "0.4.7-002" 35ZLIB_QAT_VERSION = "0.4.7-002"