diff options
Diffstat (limited to 'meta-isg/common/recipes-extended/qat')
-rw-r--r-- | meta-isg/common/recipes-extended/qat/qat16.inc | 1 | ||||
-rw-r--r-- | meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-replace-strict_strtoull-with-kstrtoull.patch | 40 | ||||
-rw-r--r-- | meta-isg/common/recipes-extended/qat/qat16/qat16_2.6.0-65-qat-add-install-target-to-makefiles.patch (renamed from meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-add-install-target-to-makefiles.patch) | 250 | ||||
-rw-r--r-- | meta-isg/common/recipes-extended/qat/qat16/qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch | 35 | ||||
-rw-r--r-- | meta-isg/common/recipes-extended/qat/qat16_2.3.0-34.bb | 8 | ||||
-rw-r--r-- | meta-isg/common/recipes-extended/qat/qat16_2.6.0-65.bb | 13 |
6 files changed, 179 insertions, 168 deletions
diff --git a/meta-isg/common/recipes-extended/qat/qat16.inc b/meta-isg/common/recipes-extended/qat/qat16.inc index 59b21d11..0235fac4 100644 --- a/meta-isg/common/recipes-extended/qat/qat16.inc +++ b/meta-isg/common/recipes-extended/qat/qat16.inc | |||
@@ -73,6 +73,7 @@ do_compile () { | |||
73 | } | 73 | } |
74 | 74 | ||
75 | do_install() { | 75 | do_install() { |
76 | export MACHINE="${TARGET_ARCH}" | ||
76 | cd ${S}/quickassist | 77 | cd ${S}/quickassist |
77 | oe_runmake install | 78 | oe_runmake install |
78 | 79 | ||
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 deleted file mode 100644 index dee1f71a..00000000 --- a/meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-replace-strict_strtoull-with-kstrtoull.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From 4ef0e0124f73b3bc24b2f2a772d83176aaa9fb3f Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anujx.mittal@intel.com> | ||
3 | Date: Tue, 8 Sep 2015 11:53:36 +0800 | ||
4 | Subject: [PATCH] qat: replace strict_strtoull with kstrtoull | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | strict_strtoull() has been removed starting kernel v3.18. | ||
9 | Hence, replace the usage with kstrtoull(). | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anujx.mittal@intel.com> | ||
12 | --- | ||
13 | .../uclo/include/linux/uclo_platform.h | 4 ++++ | ||
14 | 1 file changed, 4 insertions(+) | ||
15 | |||
16 | diff --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 | ||
17 | index 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 | -- | ||
39 | 1.7.9.5 | ||
40 | |||
diff --git a/meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-add-install-target-to-makefiles.patch b/meta-isg/common/recipes-extended/qat/qat16/qat16_2.6.0-65-qat-add-install-target-to-makefiles.patch index 13e933ec..39600228 100644 --- a/meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-add-install-target-to-makefiles.patch +++ b/meta-isg/common/recipes-extended/qat/qat16/qat16_2.6.0-65-qat-add-install-target-to-makefiles.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | From 5c47f906182b19eee7a26c5f76b31c9bd5f29c78 Mon Sep 17 00:00:00 2001 | 1 | From f53aeef0ae6a89066cca8c9a9154e70408f6ef68 Mon Sep 17 00:00:00 2001 |
2 | From: Anuj Mittal <anujx.mittal@intel.com> | 2 | From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> |
3 | Date: Wed, 8 Jul 2015 11:35:27 +0800 | 3 | Date: Thu, 24 Mar 2016 01:11:02 +0800 |
4 | Subject: [PATCH] qat: add install target to makefiles | 4 | Subject: [PATCH] qat: add install target to makefiles |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [Configuration] | 6 | Upstream-Status: Inappropriate [Configuration] |
@@ -8,27 +8,27 @@ Upstream-Status: Inappropriate [Configuration] | |||
8 | Added an install target to makefiles to help | 8 | Added an install target to makefiles to help |
9 | install ingredients at a proper path. | 9 | install ingredients at a proper path. |
10 | 10 | ||
11 | Signed-off-by: Anuj Mittal <anujx.mittal@intel.com> | 11 | Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> |
12 | --- | 12 | --- |
13 | quickassist/Makefile | 36 +++++----- | 13 | quickassist/Makefile | 29 ++++++--- |
14 | .../access_layer/src/sample_code/Makefile | 18 +++-- | 14 | .../access_layer/src/sample_code/Makefile | 19 ++++-- |
15 | .../src/sample_code/functional/Makefile | 71 +++++++++++--------- | 15 | .../src/sample_code/functional/Makefile | 74 ++++++++++++---------- |
16 | 3 files changed, 71 insertions(+), 54 deletions(-) | 16 | 3 files changed, 75 insertions(+), 47 deletions(-) |
17 | 17 | ||
18 | diff --git a/quickassist/Makefile b/quickassist/Makefile | 18 | diff --git a/quickassist/Makefile b/quickassist/Makefile |
19 | index dcea692..01848e6 100644 | 19 | index 6c5d436..0a1ee4c 100644 |
20 | --- a/quickassist/Makefile | 20 | --- a/quickassist/Makefile |
21 | +++ b/quickassist/Makefile | 21 | +++ b/quickassist/Makefile |
22 | @@ -104,7 +104,7 @@ export DRBG_POLL_AND_WAIT=1 | 22 | @@ -109,7 +109,7 @@ ifdef WITH_CPA_MUX |
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 | 23 | ALL_TARGETS = clean lac_lib_dir libosal libosal_user qat_mux hal adf adf_user lac lac_user qat-fw install_scripts |
24 | ALL_TARGETS_CI = lac_lib_dir qat_mux_ci lac_ci lac_user_ci qat-fw install_scripts | ||
25 | else | 25 | else |
26 | -ALL_TARGETS = clean lac_lib_dir libosal libosal_user hal adf adf_user lac lac_user qat-fw install_scripts | 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 | 27 | +ALL_TARGETS = clean lac_lib_dir libosal libosal_user hal adf adf_user lac lac_user |
28 | ALL_TARGETS_CI = lac_lib_dir lac_ci lac_user_ci qat-fw install_scripts | ||
28 | endif | 29 | endif |
29 | ICP_ARCH_USER?=`uname -m` | 30 | ICP_ARCH_USER?=`uname -m` |
30 | 31 | @@ -125,7 +125,16 @@ all_ci: $(ALL_TARGETS_CI) | |
31 | @@ -116,7 +116,16 @@ all: $(ALL_TARGETS) | ||
32 | @echo 'Build Done'; | 32 | @echo 'Build Done'; |
33 | 33 | ||
34 | user: lac_lib_dir libosal_user adf_user lac_user | 34 | user: lac_lib_dir libosal_user adf_user lac_user |
@@ -46,7 +46,7 @@ index dcea692..01848e6 100644 | |||
46 | 46 | ||
47 | install_scripts: | 47 | install_scripts: |
48 | @echo ; echo 'Copying Install Scripts'; | 48 | @echo ; echo 'Copying Install Scripts'; |
49 | @@ -124,10 +133,10 @@ ifdef WITH_CPA_MUX | 49 | @@ -133,10 +142,10 @@ ifdef WITH_CPA_MUX |
50 | @cp $(ICP_BUILDSYSTEM_PATH)/build_files/qat_service_mux $(ICP_BUILD_OUTPUT)/qat_service; | 50 | @cp $(ICP_BUILDSYSTEM_PATH)/build_files/qat_service_mux $(ICP_BUILD_OUTPUT)/qat_service; |
51 | endif | 51 | endif |
52 | ifndef WITH_CPA_MUX | 52 | ifndef WITH_CPA_MUX |
@@ -60,50 +60,17 @@ index dcea692..01848e6 100644 | |||
60 | # @cp $(CONFIG_PATH)/dh89xxcc_qa_dev1.conf $(ICP_BUILD_OUTPUT)/; | 60 | # @cp $(CONFIG_PATH)/dh89xxcc_qa_dev1.conf $(ICP_BUILD_OUTPUT)/; |
61 | # @cp $(CONFIG_PATH)/dh89xxcc_qa_dev0_single_accel.conf $(ICP_BUILD_OUTPUT)/; | 61 | # @cp $(CONFIG_PATH)/dh89xxcc_qa_dev0_single_accel.conf $(ICP_BUILD_OUTPUT)/; |
62 | 62 | ||
63 | @@ -146,7 +155,6 @@ libosal_user: output_dir lac_lib_dir | 63 | @@ -233,7 +242,7 @@ lac_user: output_dir libosal_user adf_user |
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 | @@ -171,7 +179,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 | @@ -181,13 +188,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 | @@ -195,20 +199,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; | 64 | @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)/; | 65 | 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; | 66 | @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)/; | 67 | - 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); | 68 | + cp $(LAC_PATH)/src/build/linux_2.6/user_space/lib$(BASENAME)_s.so $(ICP_BUILD_OUTPUT); |
106 | 69 | ||
70 | lac_user_ci: output_dir | ||
71 | @echo ; echo 'Building LAC in user space'; | ||
72 | @@ -244,9 +253,9 @@ lac_user_ci: output_dir | ||
73 | |||
107 | qat-fw: output_dir | 74 | qat-fw: output_dir |
108 | @echo ; echo 'Copying QAT-FW Binary'; | 75 | @echo ; echo 'Copying QAT-FW Binary'; |
109 | - @cp -f $(QAT_FW_PATH)/icp_qat_ae.mof $(ICP_BUILD_OUTPUT)/mof_firmware.bin; | 76 | - @cp -f $(QAT_FW_PATH)/icp_qat_ae.mof $(ICP_BUILD_OUTPUT)/mof_firmware.bin; |
@@ -114,7 +81,7 @@ index dcea692..01848e6 100644 | |||
114 | 81 | ||
115 | qat_mux: output_dir libosal | 82 | qat_mux: output_dir libosal |
116 | @echo ; echo 'Building qat_mux module' | 83 | @echo ; echo 'Building qat_mux module' |
117 | @@ -244,6 +246,10 @@ endif | 84 | @@ -306,6 +315,10 @@ endif |
118 | 85 | ||
119 | output_dir: | 86 | output_dir: |
120 | test -d $(ICP_BUILD_OUTPUT) || mkdir -p $(ICP_BUILD_OUTPUT); | 87 | test -d $(ICP_BUILD_OUTPUT) || mkdir -p $(ICP_BUILD_OUTPUT); |
@@ -126,10 +93,10 @@ index dcea692..01848e6 100644 | |||
126 | lac_lib_dir: | 93 | lac_lib_dir: |
127 | test -d $(LAC_LIB_DIR) || mkdir -p $(LAC_LIB_DIR); | 94 | test -d $(LAC_LIB_DIR) || mkdir -p $(LAC_LIB_DIR); |
128 | diff --git a/quickassist/lookaside/access_layer/src/sample_code/Makefile b/quickassist/lookaside/access_layer/src/sample_code/Makefile | 95 | diff --git a/quickassist/lookaside/access_layer/src/sample_code/Makefile b/quickassist/lookaside/access_layer/src/sample_code/Makefile |
129 | index 91c7373..8c6901a 100644 | 96 | index c66ecfb..4cc3dbf 100644 |
130 | --- a/quickassist/lookaside/access_layer/src/sample_code/Makefile | 97 | --- a/quickassist/lookaside/access_layer/src/sample_code/Makefile |
131 | +++ b/quickassist/lookaside/access_layer/src/sample_code/Makefile | 98 | +++ 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 | 99 | @@ -89,6 +89,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 | 100 | 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 | 101 | FIPS_PATH?=$(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code/fips |
135 | FUNC_PATH=$(SAMPLE_PATH)/functional | 102 | FUNC_PATH=$(SAMPLE_PATH)/functional |
@@ -137,7 +104,7 @@ index 91c7373..8c6901a 100644 | |||
137 | 104 | ||
138 | #include the makefile with all the default and common Make variable definitions | 105 | #include the makefile with all the default and common Make variable definitions |
139 | include $(ICP_BUILDSYSTEM_PATH)/build_files/common.mk | 106 | include $(ICP_BUILDSYSTEM_PATH)/build_files/common.mk |
140 | @@ -106,6 +107,8 @@ SAMPLE_BUILD_OUTPUT?=$(SAMPLE_PATH)/build | 107 | @@ -100,6 +101,8 @@ SAMPLE_BUILD_OUTPUT?=$(SAMPLE_PATH)/build |
141 | 108 | ||
142 | output_dir: | 109 | output_dir: |
143 | test -d $(SAMPLE_BUILD_OUTPUT) || mkdir $(SAMPLE_BUILD_OUTPUT); | 110 | test -d $(SAMPLE_BUILD_OUTPUT) || mkdir $(SAMPLE_BUILD_OUTPUT); |
@@ -146,14 +113,10 @@ index 91c7373..8c6901a 100644 | |||
146 | fips_code: | 113 | fips_code: |
147 | @if test -d $(FIPS_PATH); then echo ; echo 'Building FIPS Code'; fi; | 114 | @if test -d $(FIPS_PATH); then echo ; echo 'Building FIPS Code'; fi; |
148 | @if test -d $(FIPS_PATH); \ | 115 | @if test -d $(FIPS_PATH); \ |
149 | @@ -157,17 +160,13 @@ PERF_ALL=$(MEM_DRIVER) perf_user perf_kernel | 116 | @@ -154,14 +157,11 @@ perf_all: $(PERF_ALL) |
150 | perf_all: $(PERF_ALL) | ||
151 | @echo ; echo "Build output location $(SAMPLE_BUILD_OUTPUT)"; | ||
152 | |||
153 | - | ||
154 | perf_user: output_dir | 117 | perf_user: output_dir |
155 | @echo ; echo "Building perf_user"; | 118 | @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 | 119 | @cd $(PERF_PATH) && $(MAKE) clean ICP_OS_LEVEL=user_space && $(MAKE) ARCH=$(ICP_ARCH_USER) 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)/; | 120 | - @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)/; | 121 | - @cp $(PERF_PATH)/build/linux_2.6/user_space/$(PERF_OUTPUT_NAME) $(SAMPLE_BUILD_OUTPUT)/; |
159 | 122 | ||
@@ -161,10 +124,12 @@ index 91c7373..8c6901a 100644 | |||
161 | @echo ; echo "Building perf_kernel"; | 124 | @echo ; echo "Building perf_kernel"; |
162 | @cd $(PERF_PATH) && $(MAKE) ICP_OS_LEVEL=kernel_space | 125 | @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)/; | 126 | - @cp $(PERF_PATH)/build/linux_2.6/$(ICP_OS_LEVEL)/$(PERF_OUTPUT_NAME).ko $(SAMPLE_BUILD_OUTPUT)/; |
164 | 127 | - | |
165 | common_mem_drv: output_dir | 128 | + |
129 | common_mem_drv_kernel: output_dir | ||
166 | @echo ; echo "Building common_mem_drv kernel space"; | 130 | @echo ; echo "Building common_mem_drv kernel space"; |
167 | @@ -180,12 +179,19 @@ common_mem_drv: output_dir | 131 | @cd $(CMN_ROOT) && $(MAKE) ICP_OS_LEVEL=user_space cm_kernel |
132 | @@ -175,12 +175,19 @@ common_mem_drv_user: output_dir | ||
168 | perf_qae: output_dir | 133 | perf_qae: output_dir |
169 | @echo ; echo "Building perf_qae"; | 134 | @echo ; echo "Building perf_qae"; |
170 | @cd $(CMN_ROOT)/linux/kernel_space && $(MAKE) ICP_OS_LEVEL=kernel_space | 135 | @cd $(CMN_ROOT)/linux/kernel_space && $(MAKE) ICP_OS_LEVEL=kernel_space |
@@ -187,7 +152,7 @@ index 91c7373..8c6901a 100644 | |||
187 | all: $(MEM_DRIVER) fips_code perf_user perf_kernel func | 152 | all: $(MEM_DRIVER) fips_code perf_user perf_kernel func |
188 | perf: $(MEM_DRIVER) perf_kernel | 153 | perf: $(MEM_DRIVER) perf_kernel |
189 | diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile | 154 | diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile |
190 | index 8944883..0355a70 100644 | 155 | index 3208acf..41754e8 100644 |
191 | --- a/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile | 156 | --- a/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile |
192 | +++ b/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile | 157 | +++ b/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile |
193 | @@ -64,6 +64,8 @@ SYM_PATH?=$(SAMPLE_PATH)/sym | 158 | @@ -64,6 +64,8 @@ SYM_PATH?=$(SAMPLE_PATH)/sym |
@@ -197,9 +162,9 @@ index 8944883..0355a70 100644 | |||
197 | +BIN_INSTALLPATH=$(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR)/ | 162 | +BIN_INSTALLPATH=$(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR)/ |
198 | +MODULE_INSTALLPATH=$(SAMPLE_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers | 163 | +MODULE_INSTALLPATH=$(SAMPLE_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers |
199 | 164 | ||
200 | ifeq ($(WITH_CMDRV),1) | 165 | CMN_ROOT?=$(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code/performance/qae/ |
201 | CMN_ROOT?=$(ICP_ROOT)/quickassist/utilities/libqae_mem/ | 166 | CMN_MODULE_NAME?=qaeMemDrv |
202 | @@ -110,6 +112,7 @@ SAMPLE_BUILD_OUTPUT?=$(SAMPLE_PATH)/build | 167 | @@ -105,6 +107,7 @@ SAMPLE_BUILD_OUTPUT?=$(SAMPLE_PATH)/build |
203 | 168 | ||
204 | output_dir: | 169 | output_dir: |
205 | test -d $(SAMPLE_BUILD_OUTPUT) || mkdir $(SAMPLE_BUILD_OUTPUT); | 170 | test -d $(SAMPLE_BUILD_OUTPUT) || mkdir $(SAMPLE_BUILD_OUTPUT); |
@@ -207,17 +172,23 @@ index 8944883..0355a70 100644 | |||
207 | 172 | ||
208 | BUILD_DC=dc_dp_sample stateless_sample stateful_sample \ | 173 | BUILD_DC=dc_dp_sample stateless_sample stateful_sample \ |
209 | stateless_multi_op_checksum_sample | 174 | stateless_multi_op_checksum_sample |
210 | @@ -119,23 +122,15 @@ dc: $(BUILD_DC) | 175 | @@ -114,31 +117,23 @@ dc: $(BUILD_DC) |
211 | 176 | ||
212 | dc_dp_sample: output_dir | 177 | dc_dp_sample: output_dir |
213 | @cd $(DC_PATH)/dc_dp_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space | 178 | @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)/; | 179 | - @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample $(SAMPLE_BUILD_OUTPUT)/; |
180 | ifneq ($(WITH_UPSTREAM),1) | ||
181 | @cd $(DC_PATH)/dc_dp_sample && $(MAKE) ICP_OS_LEVEL=kernel_space | ||
215 | - @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | 182 | - @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample.ko $(SAMPLE_BUILD_OUTPUT)/; |
183 | endif | ||
216 | 184 | ||
217 | stateless_sample: output_dir | 185 | stateless_sample: output_dir |
218 | @cd $(DC_PATH)/stateless_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space | 186 | @cd $(DC_PATH)/stateless_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space |
219 | - @cp $(DC_PATH)/stateless_sample/dc_stateless_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
220 | - @cp $(DC_PATH)/stateless_sample/dc_stateless_sample $(SAMPLE_BUILD_OUTPUT)/; | 187 | - @cp $(DC_PATH)/stateless_sample/dc_stateless_sample $(SAMPLE_BUILD_OUTPUT)/; |
188 | ifneq ($(WITH_UPSTREAM),1) | ||
189 | @cd $(DC_PATH)/stateless_sample && $(MAKE) ICP_OS_LEVEL=kernel_space | ||
190 | - @cp $(DC_PATH)/stateless_sample/dc_stateless_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
191 | endif | ||
221 | 192 | ||
222 | stateful_sample: output_dir | 193 | stateful_sample: output_dir |
223 | @cd $(DC_PATH)/stateful_sample && $(MAKE) clean ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=user_space | 194 | @cd $(DC_PATH)/stateful_sample && $(MAKE) clean ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=user_space |
@@ -225,119 +196,158 @@ index 8944883..0355a70 100644 | |||
225 | - @cp $(DC_PATH)/stateful_sample/paper4 $(SAMPLE_BUILD_OUTPUT)/; | 196 | - @cp $(DC_PATH)/stateful_sample/paper4 $(SAMPLE_BUILD_OUTPUT)/; |
226 | 197 | ||
227 | stateless_multi_op_checksum_sample: output_dir | 198 | stateless_multi_op_checksum_sample: output_dir |
228 | @cd $(DC_PATH)/stateless_multi_op_checksum_sample && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space | 199 | @cd $(DC_PATH)/stateless_multi_op_checksum_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space |
229 | - @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
230 | - @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample $(SAMPLE_BUILD_OUTPUT)/; | 200 | - @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample $(SAMPLE_BUILD_OUTPUT)/; |
201 | ifneq ($(WITH_UPSTREAM),1) | ||
202 | @cd $(DC_PATH)/stateless_multi_op_checksum_sample && $(MAKE) ICP_OS_LEVEL=kernel_space | ||
203 | - @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
204 | endif | ||
231 | 205 | ||
232 | BUILD_SYN=algchaining_sample ccm_sample cipher_sample \ | 206 | BUILD_SYN=algchaining_sample ccm_sample cipher_sample \ |
233 | drbg_sample gcm_sample hash_file_sample \ | 207 | @@ -154,86 +149,65 @@ sym:$(BUILD_SYN) |
234 | @@ -146,57 +141,36 @@ sym:$(BUILD_SYN) | ||
235 | @echo ; echo "Build sym component"; | 208 | @echo ; echo "Build sym component"; |
236 | algchaining_sample: output_dir | 209 | algchaining_sample: output_dir |
237 | @cd $(SYM_PATH)/alg_chaining_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space | 210 | @cd $(SYM_PATH)/alg_chaining_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space |
238 | - @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
239 | - @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample $(SAMPLE_BUILD_OUTPUT)/; | 211 | - @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample $(SAMPLE_BUILD_OUTPUT)/; |
212 | ifneq ($(WITH_UPSTREAM),1) | ||
213 | @cd $(SYM_PATH)/alg_chaining_sample && $(MAKE) ICP_OS_LEVEL=kernel_space | ||
214 | - @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
215 | endif | ||
240 | 216 | ||
241 | ccm_sample: output_dir | 217 | ccm_sample: output_dir |
242 | @cd $(SYM_PATH)/ccm_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space | 218 | @cd $(SYM_PATH)/ccm_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space |
243 | - @cp $(SYM_PATH)/ccm_sample/ccm_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
244 | - @cp $(SYM_PATH)/ccm_sample/ccm_sample $(SAMPLE_BUILD_OUTPUT)/; | 219 | - @cp $(SYM_PATH)/ccm_sample/ccm_sample $(SAMPLE_BUILD_OUTPUT)/; |
220 | ifneq ($(WITH_UPSTREAM),1) | ||
221 | @cd $(SYM_PATH)/ccm_sample && $(MAKE) ICP_OS_LEVEL=kernel_space | ||
222 | - @cp $(SYM_PATH)/ccm_sample/ccm_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
223 | endif | ||
245 | 224 | ||
246 | cipher_sample: output_dir | 225 | cipher_sample: output_dir |
247 | @cd $(SYM_PATH)/cipher_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space | 226 | @cd $(SYM_PATH)/cipher_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space |
248 | - @cp $(SYM_PATH)/cipher_sample/cipher_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
249 | - @cp $(SYM_PATH)/cipher_sample/cipher_sample $(SAMPLE_BUILD_OUTPUT)/; | 227 | - @cp $(SYM_PATH)/cipher_sample/cipher_sample $(SAMPLE_BUILD_OUTPUT)/; |
228 | ifneq ($(WITH_UPSTREAM),1) | ||
229 | @cd $(SYM_PATH)/cipher_sample && $(MAKE) ICP_OS_LEVEL=kernel_space | ||
230 | - @cp $(SYM_PATH)/cipher_sample/cipher_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
231 | endif | ||
250 | 232 | ||
251 | drbg_sample: output_dir | 233 | drbg_sample: output_dir |
252 | @cd $(SYM_PATH)/drbg_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space | 234 | @cd $(SYM_PATH)/drbg_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space |
253 | - @cp $(SYM_PATH)/drbg_sample/drbg_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
254 | - @cp $(SYM_PATH)/drbg_sample/drbg_sample $(SAMPLE_BUILD_OUTPUT)/; | 235 | - @cp $(SYM_PATH)/drbg_sample/drbg_sample $(SAMPLE_BUILD_OUTPUT)/; |
236 | ifneq ($(WITH_UPSTREAM),1) | ||
237 | @cd $(SYM_PATH)/drbg_sample && $(MAKE) ICP_OS_LEVEL=kernel_space | ||
238 | - @cp $(SYM_PATH)/drbg_sample/drbg_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
239 | endif | ||
255 | 240 | ||
256 | gcm_sample: output_dir | 241 | gcm_sample: output_dir |
257 | @cd $(SYM_PATH)/gcm_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space | 242 | @cd $(SYM_PATH)/gcm_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space |
258 | - @cp $(SYM_PATH)/gcm_sample/gcm_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
259 | - @cp $(SYM_PATH)/gcm_sample/gcm_sample $(SAMPLE_BUILD_OUTPUT)/; | 243 | - @cp $(SYM_PATH)/gcm_sample/gcm_sample $(SAMPLE_BUILD_OUTPUT)/; |
244 | ifneq ($(WITH_UPSTREAM),1) | ||
245 | @cd $(SYM_PATH)/gcm_sample && $(MAKE) ICP_OS_LEVEL=kernel_space | ||
246 | - @cp $(SYM_PATH)/gcm_sample/gcm_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
247 | endif | ||
260 | 248 | ||
261 | hash_file_sample: output_dir | 249 | hash_file_sample: output_dir |
262 | @cd $(SYM_PATH)/hash_file_sample && $(MAKE) clean ICP_OS_LEVEL=user_space&& $(MAKE) ICP_OS_LEVEL=user_space | 250 | @cd $(SYM_PATH)/hash_file_sample && $(MAKE) clean ICP_OS_LEVEL=user_space&& $(MAKE) ICP_OS_LEVEL=user_space |
263 | - @cp $(SYM_PATH)/hash_file_sample/hash_file_sample $(SAMPLE_BUILD_OUTPUT)/; | 251 | - @cp $(SYM_PATH)/hash_file_sample/hash_file_sample $(SAMPLE_BUILD_OUTPUT)/; |
264 | 252 | ||
265 | hash_sample: output_dir | 253 | hash_sample: output_dir |
266 | @cd $(SYM_PATH)/hash_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space | 254 | @cd $(SYM_PATH)/hash_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space |
267 | - @cp $(SYM_PATH)/hash_sample/hash_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
268 | - @cp $(SYM_PATH)/hash_sample/hash_sample $(SAMPLE_BUILD_OUTPUT)/; | 255 | - @cp $(SYM_PATH)/hash_sample/hash_sample $(SAMPLE_BUILD_OUTPUT)/; |
256 | ifneq ($(WITH_UPSTREAM),1) | ||
257 | @cd $(SYM_PATH)/hash_sample && $(MAKE) ICP_OS_LEVEL=kernel_space | ||
258 | - @cp $(SYM_PATH)/hash_sample/hash_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
259 | endif | ||
269 | 260 | ||
270 | ipsec_sample: output_dir | 261 | ipsec_sample: output_dir |
271 | @cd $(SYM_PATH)/ipsec_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space | 262 | @cd $(SYM_PATH)/ipsec_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space |
272 | - @cp $(SYM_PATH)/ipsec_sample/ipsec_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
273 | - @cp $(SYM_PATH)/ipsec_sample/ipsec_sample $(SAMPLE_BUILD_OUTPUT)/; | 263 | - @cp $(SYM_PATH)/ipsec_sample/ipsec_sample $(SAMPLE_BUILD_OUTPUT)/; |
264 | ifneq ($(WITH_UPSTREAM),1) | ||
265 | @cd $(SYM_PATH)/ipsec_sample && $(MAKE) ICP_OS_LEVEL=kernel_space | ||
266 | - @cp $(SYM_PATH)/ipsec_sample/ipsec_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
267 | endif | ||
274 | 268 | ||
275 | nrbg_sample: output_dir | 269 | nrbg_sample: output_dir |
276 | @cd $(SYM_PATH)/nrbg_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space | 270 | @cd $(SYM_PATH)/nrbg_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space |
277 | - @cp $(SYM_PATH)/nrbg_sample/nrbg_sample $(SAMPLE_BUILD_OUTPUT)/; | 271 | - @cp $(SYM_PATH)/nrbg_sample/nrbg_sample $(SAMPLE_BUILD_OUTPUT)/; |
272 | ifneq ($(WITH_UPSTREAM),1) | ||
273 | @cd $(SYM_PATH)/nrbg_sample && $(MAKE) && $(MAKE) ICP_OS_LEVEL=kernel_space | ||
278 | - @cp $(SYM_PATH)/nrbg_sample/nrbg_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | 274 | - @cp $(SYM_PATH)/nrbg_sample/nrbg_sample.ko $(SAMPLE_BUILD_OUTPUT)/; |
275 | endif | ||
279 | 276 | ||
280 | ssl_sample: output_dir | 277 | ssl_sample: output_dir |
281 | @cd $(SYM_PATH)/ssl_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space | 278 | @cd $(SYM_PATH)/ssl_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space |
282 | - @cp $(SYM_PATH)/ssl_sample/ssl_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
283 | - @cp $(SYM_PATH)/ssl_sample/ssl_sample $(SAMPLE_BUILD_OUTPUT)/; | 279 | - @cp $(SYM_PATH)/ssl_sample/ssl_sample $(SAMPLE_BUILD_OUTPUT)/; |
280 | ifneq ($(WITH_UPSTREAM),1) | ||
281 | @cd $(SYM_PATH)/ssl_sample && $(MAKE) ICP_OS_LEVEL=kernel_space | ||
282 | - @cp $(SYM_PATH)/ssl_sample/ssl_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
283 | endif | ||
284 | 284 | ||
285 | sym_dp_sample: output_dir | 285 | sym_dp_sample: output_dir |
286 | @cd $(SYM_PATH)/symdp_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space | 286 | @cd $(SYM_PATH)/symdp_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space |
287 | - @cp $(SYM_PATH)/symdp_sample/sym_dp_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
288 | - @cp $(SYM_PATH)/symdp_sample/sym_dp_sample $(SAMPLE_BUILD_OUTPUT)/; | 287 | - @cp $(SYM_PATH)/symdp_sample/sym_dp_sample $(SAMPLE_BUILD_OUTPUT)/; |
288 | ifneq ($(WITH_UPSTREAM),1) | ||
289 | @cd $(SYM_PATH)/symdp_sample && $(MAKE) ICP_OS_LEVEL=kernel_space | ||
290 | - @cp $(SYM_PATH)/symdp_sample/sym_dp_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
291 | endif | ||
289 | 292 | ||
290 | BUILD_ASYM=diffie_hellman_sample prime_sample | 293 | BUILD_ASYM=diffie_hellman_sample prime_sample |
291 | 294 | @@ -243,18 +217,52 @@ asym: $(BUILD_ASYM) | |
292 | @@ -205,13 +179,44 @@ asym: $(BUILD_ASYM) | ||
293 | 295 | ||
294 | diffie_hellman_sample: output_dir | 296 | diffie_hellman_sample: output_dir |
295 | @cd $(ASYM_PATH)/diffie_hellman_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space | 297 | @cd $(ASYM_PATH)/diffie_hellman_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space |
296 | - @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
297 | - @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample $(SAMPLE_BUILD_OUTPUT)/; | 298 | - @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample $(SAMPLE_BUILD_OUTPUT)/; |
299 | ifneq ($(WITH_UPSTREAM),1) | ||
300 | @cd $(ASYM_PATH)/diffie_hellman_sample && $(MAKE) ICP_OS_LEVEL=kernel_space | ||
301 | - @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
302 | endif | ||
298 | 303 | ||
299 | prime_sample: output_dir | 304 | prime_sample: output_dir |
300 | @cd $(ASYM_PATH)/prime_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space | 305 | @cd $(ASYM_PATH)/prime_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space |
301 | - @cp $(ASYM_PATH)/prime_sample/prime_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
302 | - @cp $(ASYM_PATH)/prime_sample/prime_sample $(SAMPLE_BUILD_OUTPUT)/; | 306 | - @cp $(ASYM_PATH)/prime_sample/prime_sample $(SAMPLE_BUILD_OUTPUT)/; |
307 | ifneq ($(WITH_UPSTREAM),1) | ||
308 | @cd $(ASYM_PATH)/prime_sample && $(MAKE) ICP_OS_LEVEL=kernel_space | ||
309 | - @cp $(ASYM_PATH)/prime_sample/prime_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
310 | +endif | ||
303 | + | 311 | + |
304 | +install: output_dir | 312 | +install: output_dir |
305 | + @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample.ko $(MODULE_INSTALLPATH); | ||
306 | + @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample $(BIN_INSTALLPATH); | 313 | + @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample $(BIN_INSTALLPATH); |
307 | + @cp $(DC_PATH)/stateful_sample/dc_stateful_sample $(BIN_INSTALLPATH); | 314 | + @cp $(DC_PATH)/stateful_sample/dc_stateful_sample $(BIN_INSTALLPATH); |
308 | + @cp $(DC_PATH)/stateful_sample/paper4 $(BIN_INSTALLPATH); | 315 | + @cp $(DC_PATH)/stateful_sample/paper4 $(BIN_INSTALLPATH); |
309 | + @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample $(BIN_INSTALLPATH); | 316 | + @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample $(BIN_INSTALLPATH); |
310 | + @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample.ko $(MODULE_INSTALLPATH); | ||
311 | + @cp $(DC_PATH)/stateless_sample/dc_stateless_sample.ko $(MODULE_INSTALLPATH); | ||
312 | + @cp $(DC_PATH)/stateless_sample/dc_stateless_sample $(BIN_INSTALLPATH); | 317 | + @cp $(DC_PATH)/stateless_sample/dc_stateless_sample $(BIN_INSTALLPATH); |
313 | + @cp $(ASYM_PATH)/prime_sample/prime_sample.ko $(MODULE_INSTALLPATH); | ||
314 | + @cp $(ASYM_PATH)/prime_sample/prime_sample $(BIN_INSTALLPATH); | 318 | + @cp $(ASYM_PATH)/prime_sample/prime_sample $(BIN_INSTALLPATH); |
315 | + @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample.ko $(MODULE_INSTALLPATH); | ||
316 | + @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample $(BIN_INSTALLPATH); | 319 | + @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample $(BIN_INSTALLPATH); |
317 | + @cp $(SYM_PATH)/symdp_sample/sym_dp_sample.ko $(MODULE_INSTALLPATH); | ||
318 | + @cp $(SYM_PATH)/symdp_sample/sym_dp_sample $(BIN_INSTALLPATH); | 320 | + @cp $(SYM_PATH)/symdp_sample/sym_dp_sample $(BIN_INSTALLPATH); |
319 | + @cp $(SYM_PATH)/ssl_sample/ssl_sample.ko $(MODULE_INSTALLPATH); | ||
320 | + @cp $(SYM_PATH)/ssl_sample/ssl_sample $(BIN_INSTALLPATH); | 321 | + @cp $(SYM_PATH)/ssl_sample/ssl_sample $(BIN_INSTALLPATH); |
321 | + @cp $(SYM_PATH)/nrbg_sample/nrbg_sample $(BIN_INSTALLPATH); | 322 | + @cp $(SYM_PATH)/nrbg_sample/nrbg_sample $(BIN_INSTALLPATH); |
322 | + @cp $(SYM_PATH)/nrbg_sample/nrbg_sample.ko $(MODULE_INSTALLPATH); | ||
323 | + @cp $(SYM_PATH)/ipsec_sample/ipsec_sample.ko $(MODULE_INSTALLPATH); | ||
324 | + @cp $(SYM_PATH)/hash_file_sample/hash_file_sample $(BIN_INSTALLPATH); | 323 | + @cp $(SYM_PATH)/hash_file_sample/hash_file_sample $(BIN_INSTALLPATH); |
325 | + @cp $(SYM_PATH)/ipsec_sample/ipsec_sample $(BIN_INSTALLPATH); | 324 | + @cp $(SYM_PATH)/ipsec_sample/ipsec_sample $(BIN_INSTALLPATH); |
326 | + @cp $(SYM_PATH)/hash_sample/hash_sample.ko $(MODULE_INSTALLPATH); | ||
327 | + @cp $(SYM_PATH)/hash_sample/hash_sample $(BIN_INSTALLPATH); | 325 | + @cp $(SYM_PATH)/hash_sample/hash_sample $(BIN_INSTALLPATH); |
328 | + @cp $(SYM_PATH)/gcm_sample/gcm_sample.ko $(MODULE_INSTALLPATH); | ||
329 | + @cp $(SYM_PATH)/gcm_sample/gcm_sample $(BIN_INSTALLPATH); | 326 | + @cp $(SYM_PATH)/gcm_sample/gcm_sample $(BIN_INSTALLPATH); |
330 | + @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample.ko $(MODULE_INSTALLPATH); | ||
331 | + @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample $(BIN_INSTALLPATH); | 327 | + @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample $(BIN_INSTALLPATH); |
332 | + @cp $(SYM_PATH)/ccm_sample/ccm_sample.ko $(MODULE_INSTALLPATH); | ||
333 | + @cp $(SYM_PATH)/ccm_sample/ccm_sample $(BIN_INSTALLPATH); | 328 | + @cp $(SYM_PATH)/ccm_sample/ccm_sample $(BIN_INSTALLPATH); |
334 | + @cp $(SYM_PATH)/drbg_sample/drbg_sample.ko $(MODULE_INSTALLPATH); | ||
335 | + @cp $(SYM_PATH)/drbg_sample/drbg_sample $(BIN_INSTALLPATH); | 329 | + @cp $(SYM_PATH)/drbg_sample/drbg_sample $(BIN_INSTALLPATH); |
336 | + @cp $(SYM_PATH)/cipher_sample/cipher_sample.ko $(MODULE_INSTALLPATH); | ||
337 | + @cp $(SYM_PATH)/cipher_sample/cipher_sample $(BIN_INSTALLPATH); | 330 | + @cp $(SYM_PATH)/cipher_sample/cipher_sample $(BIN_INSTALLPATH); |
331 | + | ||
332 | +ifneq ($(WITH_UPSTREAM),1) | ||
333 | + @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample.ko $(MODULE_INSTALLPATH); | ||
334 | + @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample.ko $(MODULE_INSTALLPATH); | ||
335 | + @cp $(DC_PATH)/stateless_sample/dc_stateless_sample.ko $(MODULE_INSTALLPATH); | ||
336 | + @cp $(ASYM_PATH)/prime_sample/prime_sample.ko $(MODULE_INSTALLPATH); | ||
337 | + @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample.ko $(MODULE_INSTALLPATH); | ||
338 | + @cp $(SYM_PATH)/symdp_sample/sym_dp_sample.ko $(MODULE_INSTALLPATH); | ||
339 | + @cp $(SYM_PATH)/ssl_sample/ssl_sample.ko $(MODULE_INSTALLPATH); | ||
340 | + @cp $(SYM_PATH)/nrbg_sample/nrbg_sample.ko $(MODULE_INSTALLPATH); | ||
341 | + @cp $(SYM_PATH)/ipsec_sample/ipsec_sample.ko $(MODULE_INSTALLPATH); | ||
342 | + @cp $(SYM_PATH)/hash_sample/hash_sample.ko $(MODULE_INSTALLPATH); | ||
343 | + @cp $(SYM_PATH)/gcm_sample/gcm_sample.ko $(MODULE_INSTALLPATH); | ||
344 | + @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample.ko $(MODULE_INSTALLPATH); | ||
345 | + @cp $(SYM_PATH)/ccm_sample/ccm_sample.ko $(MODULE_INSTALLPATH); | ||
346 | + @cp $(SYM_PATH)/drbg_sample/drbg_sample.ko $(MODULE_INSTALLPATH); | ||
347 | + @cp $(SYM_PATH)/cipher_sample/cipher_sample.ko $(MODULE_INSTALLPATH); | ||
348 | endif | ||
338 | 349 | ||
339 | CLEAN_DC=clean_dc_dp_sample clean_stateless_sample \ | 350 | CLEAN_DC=clean_dc_dp_sample clean_stateless_sample \ |
340 | clean_stateful_sample \ | ||
341 | -- | 351 | -- |
342 | 1.7.9.5 | 352 | 1.9.1 |
343 | 353 | ||
diff --git a/meta-isg/common/recipes-extended/qat/qat16/qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch b/meta-isg/common/recipes-extended/qat/qat16/qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch new file mode 100644 index 00000000..21cdeaee --- /dev/null +++ b/meta-isg/common/recipes-extended/qat/qat16/qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From b21929c42aca4bc80f6c48b5ac31bf20165b2f3e Mon Sep 17 00:00:00 2001 | ||
2 | From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | ||
3 | Date: Fri, 25 Mar 2016 18:02:37 +0800 | ||
4 | Subject: [PATCH] qat: override CC LD AR only when it is not define | ||
5 | |||
6 | Upstream-Status: Inappropriate [Configuration] | ||
7 | |||
8 | To make sure that compiler linker and archiver will override only when | ||
9 | it is not defined by the environment. | ||
10 | |||
11 | Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | ||
12 | --- | ||
13 | quickassist/build_system/build_files/Core/ia.mk | 6 +++--- | ||
14 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/quickassist/build_system/build_files/Core/ia.mk b/quickassist/build_system/build_files/Core/ia.mk | ||
17 | index 4a4d123..f9aca23 100755 | ||
18 | --- a/quickassist/build_system/build_files/Core/ia.mk | ||
19 | +++ b/quickassist/build_system/build_files/Core/ia.mk | ||
20 | @@ -67,9 +67,9 @@ | ||
21 | # e.g. setenv CROSS_COMPILE x86_64-linux | ||
22 | ifdef CROSS_COMPILE | ||
23 | ifdef MACHINE | ||
24 | -CC = $(CROSS_COMPILE)gcc | ||
25 | -LD = $(CROSS_COMPILE)ld | ||
26 | -AR = $(CROSS_COMPILE)ar | ||
27 | +CC ?= $(CROSS_COMPILE)gcc | ||
28 | +LD ?= $(CROSS_COMPILE)ld | ||
29 | +AR ?= $(CROSS_COMPILE)ar | ||
30 | else | ||
31 | $(error MACHINE is undefined. Please set your target i.e. x86_64 \ | ||
32 | "-> setenv MACHINE x86_64 or export MACHINE=x86_64") | ||
33 | -- | ||
34 | 1.9.1 | ||
35 | |||
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 deleted file mode 100644 index d6e9af40..00000000 --- a/meta-isg/common/recipes-extended/qat/qat16_2.3.0-34.bb +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | include qat16.inc | ||
2 | |||
3 | SRC_URI += "file://qat16_2.3.0-34-qat-add-install-target-to-makefiles.patch \ | ||
4 | file://qat16_2.3.0-34-qat-replace-strict_strtoull-with-kstrtoull.patch \ | ||
5 | " | ||
6 | |||
7 | SRC_URI[qat.md5sum] = "9614bf598bc8e7eedc8adb6d29109033" | ||
8 | SRC_URI[qat.sha256sum] = "1f9708de3c132258eaa488c82760f374b6b6838c85cafef2e8c61034fe0f7031" | ||
diff --git a/meta-isg/common/recipes-extended/qat/qat16_2.6.0-65.bb b/meta-isg/common/recipes-extended/qat/qat16_2.6.0-65.bb new file mode 100644 index 00000000..7444ccec --- /dev/null +++ b/meta-isg/common/recipes-extended/qat/qat16_2.6.0-65.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | include qat16.inc | ||
2 | |||
3 | SRC_URI += "https://01.org/sites/default/files/page/qatmux.l.2.6.0-60.tgz;name=qat \ | ||
4 | file://qat16_2.6.0-65-qat-add-install-target-to-makefiles.patch \ | ||
5 | file://qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch \ | ||
6 | " | ||
7 | |||
8 | SRC_URI[qat.md5sum] = "c54e877fb9fbb4690a9bd50793268bcf" | ||
9 | SRC_URI[qat.sha256sum] = "872046ffdf02f664d12a56cdb880403d65b914b303b75875707a9eebd9c841f5" | ||
10 | |||
11 | do_install_append() { | ||
12 | install -m 0755 ${SAMPLE_CODE_DIR}/performance/compression/calgary32 ${D}${base_libdir}/firmware | ||
13 | } | ||