diff options
| author | Yongxin Liu <yongxin.liu@windriver.com> | 2021-04-12 16:24:37 +0800 |
|---|---|---|
| committer | Anuj Mittal <anuj.mittal@intel.com> | 2021-04-14 13:30:21 +0800 |
| commit | ba8f6ba46896eab6653a5aa9b4e8dd94e3440c7b (patch) | |
| tree | c5ee395b40bf5a8836f76be59a0db92a4f0f5e9d | |
| parent | 62bf74ca2e504e4287a34ccab68297efa16bd481 (diff) | |
| download | meta-intel-qat-ba8f6ba46896eab6653a5aa9b4e8dd94e3440c7b.tar.gz | |
qat16: remove recipe for qat16
qat16 is not maintained for a long time. It seems noboby is
using it now.
Removed patches:
0001-OsalServices-Only-use-bits-time-with-GLIBC.patch
qat16-Osal-fix-build-with-x32.patch
qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch
qat16_2.3.0-34-qat-fix-for-cross-compilation-issue.patch
qat16_2.5.0-80-qat-Added-include-dir-path.patch
qat16_2.5.0-80-qat-change-in-return-type-of-func-in-kernel-v4.4.patch
qat16_2.6.0-65-qat-add-install-target-to-makefiles.patch
Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
9 files changed, 0 insertions, 721 deletions
diff --git a/recipes-extended/qat/files/0001-OsalServices-Only-use-bits-time-with-GLIBC.patch b/recipes-extended/qat/files/0001-OsalServices-Only-use-bits-time-with-GLIBC.patch deleted file mode 100644 index d627353..0000000 --- a/recipes-extended/qat/files/0001-OsalServices-Only-use-bits-time-with-GLIBC.patch +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | From f83ac703a6babfa7f177b8f14ff3263a08fd8871 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Saul Wold <sgw@linux.intel.com> | ||
| 3 | Date: Thu, 9 Feb 2017 14:35:57 -0800 | ||
| 4 | Subject: [PATCH] OsalServices: Only use bits/time with GLIBC | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
| 8 | --- | ||
| 9 | quickassist/utilities/osal/src/linux/user_space/OsalServices.c | 2 +- | ||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 11 | |||
| 12 | diff --git a/quickassist/utilities/osal/src/linux/user_space/OsalServices.c b/quickassist/utilities/osal/src/linux/user_space/OsalServices.c | ||
| 13 | index 49fde45..5f50aaa 100755 | ||
| 14 | --- a/quickassist/utilities/osal/src/linux/user_space/OsalServices.c | ||
| 15 | +++ b/quickassist/utilities/osal/src/linux/user_space/OsalServices.c | ||
| 16 | @@ -41,7 +41,7 @@ | ||
| 17 | |||
| 18 | #include <stdarg.h> | ||
| 19 | #include <stdio.h> | ||
| 20 | -#ifdef __linux__ | ||
| 21 | +#if defined(__linux__) && defined(__GLIBC__) | ||
| 22 | #include <bits/time.h> | ||
| 23 | #endif | ||
| 24 | #include <sched.h> | ||
| 25 | -- | ||
| 26 | 2.7.4 | ||
| 27 | |||
diff --git a/recipes-extended/qat/files/qat16-Osal-fix-build-with-x32.patch b/recipes-extended/qat/files/qat16-Osal-fix-build-with-x32.patch deleted file mode 100644 index 2f794ce..0000000 --- a/recipes-extended/qat/files/qat16-Osal-fix-build-with-x32.patch +++ /dev/null | |||
| @@ -1,53 +0,0 @@ | |||
| 1 | From 8da85286efc86b4f5bbf14f755c84d1982841973 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
| 3 | Date: Wed, 3 Jan 2018 15:45:59 +0800 | ||
| 4 | Subject: [PATCH] Osal: fix build with x32 | ||
| 5 | |||
| 6 | x32 follows ILP32 model and has __x86_64__ defined too. Make sure | ||
| 7 | that we check for ILP32 also before using architecture dependent | ||
| 8 | types. | ||
| 9 | |||
| 10 | Upstream-Status: Accepted [Code released in tarball form only] | ||
| 11 | |||
| 12 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
| 13 | --- | ||
| 14 | quickassist/adf/platform/include/adf_platform_common.h | 2 +- | ||
| 15 | quickassist/utilities/osal/include/OsalTypes.h | 4 ++-- | ||
| 16 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/quickassist/adf/platform/include/adf_platform_common.h b/quickassist/adf/platform/include/adf_platform_common.h | ||
| 19 | index 8673ec1..de5c31a 100755 | ||
| 20 | --- a/quickassist/adf/platform/include/adf_platform_common.h | ||
| 21 | +++ b/quickassist/adf/platform/include/adf_platform_common.h | ||
| 22 | @@ -207,7 +207,7 @@ | ||
| 23 | * xx refers to arch, i.e.64bit or 32bit | ||
| 24 | * yy refers to number of bytes copied from src to dst, i.e. 64 or 128 bytes | ||
| 25 | */ | ||
| 26 | -#ifdef __x86_64__ | ||
| 27 | +#if (defined (__x86_64__) && !defined (__ILP32__)) | ||
| 28 | #define adf_memcpy64_64(dst, src)\ | ||
| 29 | do { \ | ||
| 30 | __asm__ __volatile__ ( \ | ||
| 31 | diff --git a/quickassist/utilities/osal/include/OsalTypes.h b/quickassist/utilities/osal/include/OsalTypes.h | ||
| 32 | index d8fa1d9..eaf08bf 100755 | ||
| 33 | --- a/quickassist/utilities/osal/include/OsalTypes.h | ||
| 34 | +++ b/quickassist/utilities/osal/include/OsalTypes.h | ||
| 35 | @@ -160,13 +160,13 @@ typedef volatile INT32 VINT32; | ||
| 36 | */ | ||
| 37 | #define OSAL_HUNDRED (100) | ||
| 38 | |||
| 39 | -#ifdef __x86_64__ | ||
| 40 | +#if (defined (__x86_64__) && !defined (__ILP32__)) | ||
| 41 | #define ARCH_INT INT64 | ||
| 42 | #else | ||
| 43 | #define ARCH_INT INT32 | ||
| 44 | #endif | ||
| 45 | |||
| 46 | -#ifdef __x86_64__ | ||
| 47 | +#if (defined (__x86_64__) && !defined (__ILP32__)) | ||
| 48 | #define UARCH_INT UINT64 | ||
| 49 | #else | ||
| 50 | #define UARCH_INT UINT32 | ||
| 51 | -- | ||
| 52 | 2.7.4 | ||
| 53 | |||
diff --git a/recipes-extended/qat/files/qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch b/recipes-extended/qat/files/qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch deleted file mode 100644 index e1ed3fc..0000000 --- a/recipes-extended/qat/files/qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | From 83f465ee776868875f6c19c2110eed4db6c547ce Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Anuj Mittal <anujx.mittal@intel.com> | ||
| 3 | Date: Thu, 10 Sep 2015 11:58:44 +0800 | ||
| 4 | Subject: [PATCH] qat: make sure CFLAGS are correct | ||
| 5 | |||
| 6 | Upstream-Status: Submitted | ||
| 7 | |||
| 8 | Ensure that all the CFLAGS values are being considered. | ||
| 9 | |||
| 10 | Signed-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 | |||
| 15 | diff --git a/quickassist/adf/user/user_proxy/src/Makefile b/quickassist/adf/user/user_proxy/src/Makefile | ||
| 16 | index 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 | -- | ||
| 29 | 1.7.9.5 | ||
| 30 | |||
diff --git a/recipes-extended/qat/files/qat16_2.3.0-34-qat-fix-for-cross-compilation-issue.patch b/recipes-extended/qat/files/qat16_2.3.0-34-qat-fix-for-cross-compilation-issue.patch deleted file mode 100644 index b7b77d0..0000000 --- a/recipes-extended/qat/files/qat16_2.3.0-34-qat-fix-for-cross-compilation-issue.patch +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | From 340701a0f44e70eafd9029e9186b74e8783f2afd Mon Sep 17 00:00:00 2001 | ||
| 2 | From: venkatasubramanian pattu <venkatasubramanianx.pattu@intel.com> | ||
| 3 | Date: Mon, 6 Jul 2015 15:57:20 +0800 | ||
| 4 | Subject: [PATCH] qat: fix for cross-compilation issue | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [Configuration] | ||
| 7 | |||
| 8 | Ensure that we are not using host compiler. | ||
| 9 | |||
| 10 | Signed-off-by: venkatasubramanian pattu <venkatasubramanianx.pattu@intel.com> | ||
| 11 | Signed-off-by: Anuj Mittal <anujx.mittal@intel.com> | ||
| 12 | --- | ||
| 13 | .../dc/stateless_multi_op_checksum_sample/Makefile | 4 ++-- | ||
| 14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/dc/stateless_multi_op_checksum_sample/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/dc/stateless_multi_op_checksum_sample/Makefile | ||
| 17 | index 01590c3..315fca7 100644 | ||
| 18 | --- a/quickassist/lookaside/access_layer/src/sample_code/functional/dc/stateless_multi_op_checksum_sample/Makefile | ||
| 19 | +++ b/quickassist/lookaside/access_layer/src/sample_code/functional/dc/stateless_multi_op_checksum_sample/Makefile | ||
| 20 | @@ -111,7 +111,7 @@ else | ||
| 21 | ADDITIONAL_OBJECTS += $(ICP_BUILD_OUTPUT)/libicp_qa_al_s.so | ||
| 22 | endif | ||
| 23 | |||
| 24 | -ADDITIONAL_OBJECTS += -L/usr/Lib -lpthread -lcrypto | ||
| 25 | +ADDITIONAL_OBJECTS += -lpthread -lcrypto | ||
| 26 | |||
| 27 | USER_SOURCE_FILES = ../../common/cpa_sample_utils.c cpa_dc_stateless_multi_op_checksum_sample.c | ||
| 28 | USER_SOURCE_FILES += ../stateless_sample/cpa_dc_sample_user.c | ||
| 29 | @@ -127,7 +127,7 @@ else | ||
| 30 | endif | ||
| 31 | |||
| 32 | default: clean | ||
| 33 | - gcc -Wall -O1 $(USER_INCLUDES) -DUSER_SPACE $(EXTRA_CFLAGS) \ | ||
| 34 | + $(CC) -Wall -O1 $(USER_INCLUDES) -DUSER_SPACE $(EXTRA_CFLAGS) \ | ||
| 35 | $(USER_SOURCE_FILES) $(ADDITIONAL_OBJECTS) -o $(OUTPUT_NAME) | ||
| 36 | |||
| 37 | clean: | ||
| 38 | -- | ||
| 39 | 1.7.9.5 | ||
| 40 | |||
diff --git a/recipes-extended/qat/files/qat16_2.5.0-80-qat-Added-include-dir-path.patch b/recipes-extended/qat/files/qat16_2.5.0-80-qat-Added-include-dir-path.patch deleted file mode 100644 index a538930..0000000 --- a/recipes-extended/qat/files/qat16_2.5.0-80-qat-Added-include-dir-path.patch +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | From 142bf81912701d94985ad656c2250650113d00de Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | ||
| 3 | Date: Tue, 22 Mar 2016 01:44:09 +0800 | ||
| 4 | Subject: [PATCH 2/2] qat: Added include dir path | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [Configuration] | ||
| 7 | |||
| 8 | Make sure that we point to the correct include path to the local | ||
| 9 | headers. | ||
| 10 | |||
| 11 | Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | ||
| 12 | --- | ||
| 13 | quickassist/build_system/build_files/env_files/linux_2.6_user_space.mk | 1 + | ||
| 14 | 1 file changed, 1 insertion(+) | ||
| 15 | |||
| 16 | diff --git a/quickassist/build_system/build_files/env_files/linux_2.6_user_space.mk b/quickassist/build_system/build_files/env_files/linux_2.6_user_space.mk | ||
| 17 | index b504f7f..a75f152 100755 | ||
| 18 | --- a/quickassist/build_system/build_files/env_files/linux_2.6_user_space.mk | ||
| 19 | +++ b/quickassist/build_system/build_files/env_files/linux_2.6_user_space.mk | ||
| 20 | @@ -84,6 +84,7 @@ INCLUDES+=-I$(API_DIR) \ | ||
| 21 | |||
| 22 | EXTRA_CFLAGS += $(cmd_line_cflags) | ||
| 23 | EXTRA_CFLAGS += -fno-strict-aliasing | ||
| 24 | +EXTRA_CFLAGS += $(INCLUDES) | ||
| 25 | EXTRA_LDFLAGS +=-whole-archive | ||
| 26 | |||
| 27 | ifeq ($(ARCH), i386) | ||
| 28 | -- | ||
| 29 | 1.9.1 | ||
| 30 | |||
diff --git a/recipes-extended/qat/files/qat16_2.5.0-80-qat-change-in-return-type-of-func-in-kernel-v4.4.patch b/recipes-extended/qat/files/qat16_2.5.0-80-qat-change-in-return-type-of-func-in-kernel-v4.4.patch deleted file mode 100644 index b427799..0000000 --- a/recipes-extended/qat/files/qat16_2.5.0-80-qat-change-in-return-type-of-func-in-kernel-v4.4.patch +++ /dev/null | |||
| @@ -1,40 +0,0 @@ | |||
| 1 | From f056dbedd106e03860de66d5c84cd018da087dda Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | ||
| 3 | Date: Tue, 22 Mar 2016 00:59:36 +0800 | ||
| 4 | Subject: [PATCH 1/2] qat: change in return type of func in kernel v4.4 | ||
| 5 | |||
| 6 | Upstream-Status: Submitted | ||
| 7 | |||
| 8 | The function 'seq_puts' return type is changed from 'int' to 'void'. | ||
| 9 | Now use of 'ret' variable is not valid. So used another condition to check | ||
| 10 | for overflow. | ||
| 11 | |||
| 12 | Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | ||
| 13 | --- | ||
| 14 | quickassist/adf/drivers/common/linux/src/adf_proc_debug.c | 6 +++--- | ||
| 15 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/quickassist/adf/drivers/common/linux/src/adf_proc_debug.c b/quickassist/adf/drivers/common/linux/src/adf_proc_debug.c | ||
| 18 | index 7d81eaa..a1dd917 100755 | ||
| 19 | --- a/quickassist/adf/drivers/common/linux/src/adf_proc_debug.c | ||
| 20 | +++ b/quickassist/adf/drivers/common/linux/src/adf_proc_debug.c | ||
| 21 | @@ -132,13 +132,13 @@ static int adf_debug_show(struct seq_file *sfile, void *v) | ||
| 22 | { | ||
| 23 | debug_file_info_t* file_info = sfile->private; | ||
| 24 | if (file_info && file_info->seq_read && file_info->page) { | ||
| 25 | - int ret = 0, old_offset = file_info->offset; | ||
| 26 | + int old_offset = file_info->offset; | ||
| 27 | file_info->offset = | ||
| 28 | file_info->seq_read(file_info->private_data, | ||
| 29 | file_info->page, PAGE_SIZE - 1, | ||
| 30 | file_info->offset); | ||
| 31 | - ret = seq_puts(sfile, (char*)file_info->page); | ||
| 32 | - if (ret) { | ||
| 33 | + seq_puts(sfile, (char*)file_info->page); | ||
| 34 | + if (sfile->count == sfile->size) { | ||
| 35 | /* run out of space - need to reprint */ | ||
| 36 | file_info->offset = old_offset; | ||
| 37 | } | ||
| 38 | -- | ||
| 39 | 1.9.1 | ||
| 40 | |||
diff --git a/recipes-extended/qat/files/qat16_2.6.0-65-qat-add-install-target-to-makefiles.patch b/recipes-extended/qat/files/qat16_2.6.0-65-qat-add-install-target-to-makefiles.patch deleted file mode 100644 index 3960022..0000000 --- a/recipes-extended/qat/files/qat16_2.6.0-65-qat-add-install-target-to-makefiles.patch +++ /dev/null | |||
| @@ -1,353 +0,0 @@ | |||
| 1 | From f53aeef0ae6a89066cca8c9a9154e70408f6ef68 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | ||
| 3 | Date: Thu, 24 Mar 2016 01:11:02 +0800 | ||
| 4 | Subject: [PATCH] qat: add install target to makefiles | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [Configuration] | ||
| 7 | |||
| 8 | Added an install target to makefiles to help | ||
| 9 | install ingredients at a proper path. | ||
| 10 | |||
| 11 | Signed-off-by: Rahul Kumar Gupta <rahul.kumarxx.gupta@intel.com> | ||
| 12 | --- | ||
| 13 | quickassist/Makefile | 29 ++++++--- | ||
| 14 | .../access_layer/src/sample_code/Makefile | 19 ++++-- | ||
| 15 | .../src/sample_code/functional/Makefile | 74 ++++++++++++---------- | ||
| 16 | 3 files changed, 75 insertions(+), 47 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/quickassist/Makefile b/quickassist/Makefile | ||
| 19 | index 6c5d436..0a1ee4c 100644 | ||
| 20 | --- a/quickassist/Makefile | ||
| 21 | +++ b/quickassist/Makefile | ||
| 22 | @@ -109,7 +109,7 @@ ifdef WITH_CPA_MUX | ||
| 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 | ||
| 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 | ALL_TARGETS_CI = lac_lib_dir lac_ci lac_user_ci qat-fw install_scripts | ||
| 29 | endif | ||
| 30 | ICP_ARCH_USER?=`uname -m` | ||
| 31 | @@ -125,7 +125,16 @@ all_ci: $(ALL_TARGETS_CI) | ||
| 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 | @@ -133,10 +142,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 | @@ -233,7 +242,7 @@ lac_user: output_dir libosal_user adf_user | ||
| 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; | ||
| 65 | cp $(LAC_PATH)/src/build/linux_2.6/user_space/lib$(BASENAME).a $(ICP_BUILD_OUTPUT)/; | ||
| 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; | ||
| 67 | - 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); | ||
| 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 | |||
| 74 | qat-fw: output_dir | ||
| 75 | @echo ; echo 'Copying QAT-FW Binary'; | ||
| 76 | - @cp -f $(QAT_FW_PATH)/icp_qat_ae.mof $(ICP_BUILD_OUTPUT)/mof_firmware.bin; | ||
| 77 | + @cp -f $(QAT_FW_PATH)/icp_qat_ae.mof $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR)/mof_firmware.bin; | ||
| 78 | @echo ; echo 'Copying MMP Binary'; | ||
| 79 | - @cp -f $(QAT_FW_PATH)/icp_qat_pke.mof $(ICP_BUILD_OUTPUT)/mmp_firmware.bin; | ||
| 80 | + @cp -f $(QAT_FW_PATH)/icp_qat_pke.mof $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR)/mmp_firmware.bin; | ||
| 81 | |||
| 82 | qat_mux: output_dir libosal | ||
| 83 | @echo ; echo 'Building qat_mux module' | ||
| 84 | @@ -306,6 +315,10 @@ endif | ||
| 85 | |||
| 86 | output_dir: | ||
| 87 | test -d $(ICP_BUILD_OUTPUT) || mkdir -p $(ICP_BUILD_OUTPUT); | ||
| 88 | + test -d $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR) || mkdir -p $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR); | ||
| 89 | + test -d $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR) || mkdir -p $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR); | ||
| 90 | + test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers; | ||
| 91 | + test -d $(ICP_BUILD_OUTPUT)/etc/init.d || mkdir -p $(ICP_BUILD_OUTPUT)/etc/init.d; | ||
| 92 | |||
| 93 | lac_lib_dir: | ||
| 94 | test -d $(LAC_LIB_DIR) || mkdir -p $(LAC_LIB_DIR); | ||
| 95 | diff --git a/quickassist/lookaside/access_layer/src/sample_code/Makefile b/quickassist/lookaside/access_layer/src/sample_code/Makefile | ||
| 96 | index c66ecfb..4cc3dbf 100644 | ||
| 97 | --- a/quickassist/lookaside/access_layer/src/sample_code/Makefile | ||
| 98 | +++ b/quickassist/lookaside/access_layer/src/sample_code/Makefile | ||
| 99 | @@ -89,6 +89,7 @@ SAMPLE_PATH?=$(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code | ||
| 100 | PERF_PATH?=$(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code/performance | ||
| 101 | FIPS_PATH?=$(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code/fips | ||
| 102 | FUNC_PATH=$(SAMPLE_PATH)/functional | ||
| 103 | +FIPS_OUTPUT_NAME=fips_sample | ||
| 104 | |||
| 105 | #include the makefile with all the default and common Make variable definitions | ||
| 106 | include $(ICP_BUILDSYSTEM_PATH)/build_files/common.mk | ||
| 107 | @@ -100,6 +101,8 @@ SAMPLE_BUILD_OUTPUT?=$(SAMPLE_PATH)/build | ||
| 108 | |||
| 109 | output_dir: | ||
| 110 | test -d $(SAMPLE_BUILD_OUTPUT) || mkdir $(SAMPLE_BUILD_OUTPUT); | ||
| 111 | + test -d $(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR) || mkdir -p $(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR) | ||
| 112 | + | ||
| 113 | fips_code: | ||
| 114 | @if test -d $(FIPS_PATH); then echo ; echo 'Building FIPS Code'; fi; | ||
| 115 | @if test -d $(FIPS_PATH); \ | ||
| 116 | @@ -154,14 +157,11 @@ perf_all: $(PERF_ALL) | ||
| 117 | perf_user: output_dir | ||
| 118 | @echo ; echo "Building perf_user"; | ||
| 119 | @cd $(PERF_PATH) && $(MAKE) clean ICP_OS_LEVEL=user_space && $(MAKE) ARCH=$(ICP_ARCH_USER) ICP_OS_LEVEL=user_space lib_shared exe | ||
| 120 | - @cp $(PERF_PATH)/build/linux_2.6/user_space/$(PERF_OUTPUT_NAME)_s.so $(SAMPLE_BUILD_OUTPUT)/; | ||
| 121 | - @cp $(PERF_PATH)/build/linux_2.6/user_space/$(PERF_OUTPUT_NAME) $(SAMPLE_BUILD_OUTPUT)/; | ||
| 122 | |||
| 123 | perf_kernel: output_dir | ||
| 124 | @echo ; echo "Building perf_kernel"; | ||
| 125 | @cd $(PERF_PATH) && $(MAKE) ICP_OS_LEVEL=kernel_space | ||
| 126 | - @cp $(PERF_PATH)/build/linux_2.6/$(ICP_OS_LEVEL)/$(PERF_OUTPUT_NAME).ko $(SAMPLE_BUILD_OUTPUT)/; | ||
| 127 | - | ||
| 128 | + | ||
| 129 | common_mem_drv_kernel: output_dir | ||
| 130 | @echo ; echo "Building common_mem_drv kernel space"; | ||
| 131 | @cd $(CMN_ROOT) && $(MAKE) ICP_OS_LEVEL=user_space cm_kernel | ||
| 132 | @@ -175,12 +175,19 @@ common_mem_drv_user: output_dir | ||
| 133 | perf_qae: output_dir | ||
| 134 | @echo ; echo "Building perf_qae"; | ||
| 135 | @cd $(CMN_ROOT)/linux/kernel_space && $(MAKE) ICP_OS_LEVEL=kernel_space | ||
| 136 | - @cp $(CMN_ROOT)/linux/kernel_space/build/linux_2.6/$(ICP_OS_LEVEL)/$(CMN_MODULE_NAME).ko $(SAMPLE_BUILD_OUTPUT)/; | ||
| 137 | - | ||
| 138 | |||
| 139 | func: output_dir | ||
| 140 | @cd $(FUNC_PATH) && $(MAKE) all; | ||
| 141 | |||
| 142 | +install: output_dir | ||
| 143 | + @cp $(PERF_PATH)/build/linux_2.6/user_space/$(PERF_OUTPUT_NAME)_s.so $(SAMPLE_BUILD_OUTPUT)$(DEST_LIBDIR); | ||
| 144 | + @cp $(PERF_PATH)/build/linux_2.6/user_space/$(PERF_OUTPUT_NAME) $(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR); | ||
| 145 | + @cp $(PERF_PATH)/build/linux_2.6/$(ICP_OS_LEVEL)/$(PERF_OUTPUT_NAME).ko $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers; | ||
| 146 | + @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; | ||
| 147 | + @cp $(FIPS_PATH)/build/linux_2.6/$(ICP_OS_LEVEL)/$(FIPS_OUTPUT_NAME).ko $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers; | ||
| 148 | + @cp $(FIPS_PATH)/build/linux_2.6/user_space/$(FIPS_OUTPUT_NAME)_s.so $(SAMPLE_BUILD_OUTPUT)$(DEST_LIBDIR); | ||
| 149 | + @cp $(FIPS_PATH)/build/linux_2.6/user_space/$(FIPS_OUTPUT_NAME).a $(SAMPLE_BUILD_OUTPUT)$(DEST_LIBDIR); | ||
| 150 | + @cd $(FUNC_PATH) && $(MAKE) install; | ||
| 151 | |||
| 152 | all: $(MEM_DRIVER) fips_code perf_user perf_kernel func | ||
| 153 | perf: $(MEM_DRIVER) perf_kernel | ||
| 154 | diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile | ||
| 155 | index 3208acf..41754e8 100644 | ||
| 156 | --- a/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile | ||
| 157 | +++ b/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile | ||
| 158 | @@ -64,6 +64,8 @@ SYM_PATH?=$(SAMPLE_PATH)/sym | ||
| 159 | ASYM_PATH?=$(SAMPLE_PATH)/asym | ||
| 160 | ICP_API_DIR?=$(ICP_ROOT)/quickassist/include/ | ||
| 161 | ICP_LAC_DIR?=$(ICP_ROOT)/quickassist/lookaside/access_layer/ | ||
| 162 | +BIN_INSTALLPATH=$(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR)/ | ||
| 163 | +MODULE_INSTALLPATH=$(SAMPLE_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers | ||
| 164 | |||
| 165 | CMN_ROOT?=$(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code/performance/qae/ | ||
| 166 | CMN_MODULE_NAME?=qaeMemDrv | ||
| 167 | @@ -105,6 +107,7 @@ SAMPLE_BUILD_OUTPUT?=$(SAMPLE_PATH)/build | ||
| 168 | |||
| 169 | output_dir: | ||
| 170 | test -d $(SAMPLE_BUILD_OUTPUT) || mkdir $(SAMPLE_BUILD_OUTPUT); | ||
| 171 | + test -d $(BIN_INSTALLPATH) || mkdir -p $(BIN_INSTALLPATH); | ||
| 172 | |||
| 173 | BUILD_DC=dc_dp_sample stateless_sample stateful_sample \ | ||
| 174 | stateless_multi_op_checksum_sample | ||
| 175 | @@ -114,31 +117,23 @@ dc: $(BUILD_DC) | ||
| 176 | |||
| 177 | dc_dp_sample: output_dir | ||
| 178 | @cd $(DC_PATH)/dc_dp_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space | ||
| 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 | ||
| 182 | - @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
| 183 | endif | ||
| 184 | |||
| 185 | stateless_sample: output_dir | ||
| 186 | @cd $(DC_PATH)/stateless_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space | ||
| 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 | ||
| 192 | |||
| 193 | stateful_sample: output_dir | ||
| 194 | @cd $(DC_PATH)/stateful_sample && $(MAKE) clean ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=user_space | ||
| 195 | - @cp $(DC_PATH)/stateful_sample/dc_stateful_sample $(SAMPLE_BUILD_OUTPUT)/; | ||
| 196 | - @cp $(DC_PATH)/stateful_sample/paper4 $(SAMPLE_BUILD_OUTPUT)/; | ||
| 197 | |||
| 198 | stateless_multi_op_checksum_sample: output_dir | ||
| 199 | @cd $(DC_PATH)/stateless_multi_op_checksum_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space | ||
| 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 | ||
| 205 | |||
| 206 | BUILD_SYN=algchaining_sample ccm_sample cipher_sample \ | ||
| 207 | @@ -154,86 +149,65 @@ sym:$(BUILD_SYN) | ||
| 208 | @echo ; echo "Build sym component"; | ||
| 209 | algchaining_sample: output_dir | ||
| 210 | @cd $(SYM_PATH)/alg_chaining_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space | ||
| 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 | ||
| 216 | |||
| 217 | ccm_sample: output_dir | ||
| 218 | @cd $(SYM_PATH)/ccm_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space | ||
| 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 | ||
| 224 | |||
| 225 | cipher_sample: output_dir | ||
| 226 | @cd $(SYM_PATH)/cipher_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space | ||
| 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 | ||
| 232 | |||
| 233 | drbg_sample: output_dir | ||
| 234 | @cd $(SYM_PATH)/drbg_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space | ||
| 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 | ||
| 240 | |||
| 241 | gcm_sample: output_dir | ||
| 242 | @cd $(SYM_PATH)/gcm_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space | ||
| 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 | ||
| 248 | |||
| 249 | hash_file_sample: output_dir | ||
| 250 | @cd $(SYM_PATH)/hash_file_sample && $(MAKE) clean ICP_OS_LEVEL=user_space&& $(MAKE) ICP_OS_LEVEL=user_space | ||
| 251 | - @cp $(SYM_PATH)/hash_file_sample/hash_file_sample $(SAMPLE_BUILD_OUTPUT)/; | ||
| 252 | |||
| 253 | hash_sample: output_dir | ||
| 254 | @cd $(SYM_PATH)/hash_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space | ||
| 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 | ||
| 260 | |||
| 261 | ipsec_sample: output_dir | ||
| 262 | @cd $(SYM_PATH)/ipsec_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space | ||
| 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 | ||
| 268 | |||
| 269 | nrbg_sample: output_dir | ||
| 270 | @cd $(SYM_PATH)/nrbg_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space | ||
| 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 | ||
| 274 | - @cp $(SYM_PATH)/nrbg_sample/nrbg_sample.ko $(SAMPLE_BUILD_OUTPUT)/; | ||
| 275 | endif | ||
| 276 | |||
| 277 | ssl_sample: output_dir | ||
| 278 | @cd $(SYM_PATH)/ssl_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space | ||
| 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 | |||
| 285 | sym_dp_sample: output_dir | ||
| 286 | @cd $(SYM_PATH)/symdp_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space | ||
| 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 | ||
| 292 | |||
| 293 | BUILD_ASYM=diffie_hellman_sample prime_sample | ||
| 294 | @@ -243,18 +217,52 @@ asym: $(BUILD_ASYM) | ||
| 295 | |||
| 296 | diffie_hellman_sample: output_dir | ||
| 297 | @cd $(ASYM_PATH)/diffie_hellman_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space | ||
| 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 | ||
| 303 | |||
| 304 | prime_sample: output_dir | ||
| 305 | @cd $(ASYM_PATH)/prime_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space | ||
| 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 | ||
| 311 | + | ||
| 312 | +install: output_dir | ||
| 313 | + @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample $(BIN_INSTALLPATH); | ||
| 314 | + @cp $(DC_PATH)/stateful_sample/dc_stateful_sample $(BIN_INSTALLPATH); | ||
| 315 | + @cp $(DC_PATH)/stateful_sample/paper4 $(BIN_INSTALLPATH); | ||
| 316 | + @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample $(BIN_INSTALLPATH); | ||
| 317 | + @cp $(DC_PATH)/stateless_sample/dc_stateless_sample $(BIN_INSTALLPATH); | ||
| 318 | + @cp $(ASYM_PATH)/prime_sample/prime_sample $(BIN_INSTALLPATH); | ||
| 319 | + @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample $(BIN_INSTALLPATH); | ||
| 320 | + @cp $(SYM_PATH)/symdp_sample/sym_dp_sample $(BIN_INSTALLPATH); | ||
| 321 | + @cp $(SYM_PATH)/ssl_sample/ssl_sample $(BIN_INSTALLPATH); | ||
| 322 | + @cp $(SYM_PATH)/nrbg_sample/nrbg_sample $(BIN_INSTALLPATH); | ||
| 323 | + @cp $(SYM_PATH)/hash_file_sample/hash_file_sample $(BIN_INSTALLPATH); | ||
| 324 | + @cp $(SYM_PATH)/ipsec_sample/ipsec_sample $(BIN_INSTALLPATH); | ||
| 325 | + @cp $(SYM_PATH)/hash_sample/hash_sample $(BIN_INSTALLPATH); | ||
| 326 | + @cp $(SYM_PATH)/gcm_sample/gcm_sample $(BIN_INSTALLPATH); | ||
| 327 | + @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample $(BIN_INSTALLPATH); | ||
| 328 | + @cp $(SYM_PATH)/ccm_sample/ccm_sample $(BIN_INSTALLPATH); | ||
| 329 | + @cp $(SYM_PATH)/drbg_sample/drbg_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 | ||
| 349 | |||
| 350 | CLEAN_DC=clean_dc_dp_sample clean_stateless_sample \ | ||
| 351 | -- | ||
| 352 | 1.9.1 | ||
| 353 | |||
diff --git a/recipes-extended/qat/qat16.inc b/recipes-extended/qat/qat16.inc deleted file mode 100644 index c653884..0000000 --- a/recipes-extended/qat/qat16.inc +++ /dev/null | |||
| @@ -1,132 +0,0 @@ | |||
| 1 | DESCRIPTION = "Intel(r) QuickAssist Technology API" | ||
| 2 | HOMEPAGE = "https://01.org/packet-processing/intel%C2%AE-quickassist-technology-drivers-and-patches" | ||
| 3 | |||
| 4 | #Dual BSD and GPLv2 License | ||
| 5 | LICENSE = "BSD & GPLv2" | ||
| 6 | LIC_FILES_CHKSUM = "\ | ||
| 7 | file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ | ||
| 8 | file://${COMMON_LICENSE_DIR}/BSD;md5=3775480a712fc46a69647678acb234cb \ | ||
| 9 | " | ||
| 10 | |||
| 11 | DEPENDS += "zlib openssl10" | ||
| 12 | PROVIDES += "virtual/qat" | ||
| 13 | |||
| 14 | SRC_URI="file://qat16_2.3.0-34-qat-fix-for-cross-compilation-issue.patch \ | ||
| 15 | file://qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch \ | ||
| 16 | file://qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch \ | ||
| 17 | file://qat16_2.5.0-80-qat-change-in-return-type-of-func-in-kernel-v4.4.patch \ | ||
| 18 | file://qat16_2.5.0-80-qat-Added-include-dir-path.patch \ | ||
| 19 | file://qat16-Osal-fix-build-with-x32.patch \ | ||
| 20 | " | ||
| 21 | |||
| 22 | COMPATIBLE_MACHINE = "null" | ||
| 23 | |||
| 24 | S = "${WORKDIR}/${ICP_DRIVER_TYPE}" | ||
| 25 | ICP_TOOLS = "accelcomp" | ||
| 26 | SAMPLE_CODE_DIR = "${S}/quickassist/lookaside/access_layer/src/sample_code" | ||
| 27 | TARGET_CC_ARCH += "$(LDFLAGS)" | ||
| 28 | |||
| 29 | export ICP_DRIVER_TYPE = "QAT1.6" | ||
| 30 | export ICP_FIRMWARE_DIR="dh895xcc" | ||
| 31 | export ICP_ROOT = "${S}" | ||
| 32 | export ICP_ENV_DIR = "${S}/quickassist/build_system/build_files/env_files" | ||
| 33 | export ICP_BUILDSYSTEM_PATH = "${S}/quickassist/build_system" | ||
| 34 | export ICP_TOOLS_TARGET = "${ICP_TOOLS}" | ||
| 35 | export FUNC_PATH = "${ICP_ROOT}/quickassist/lookaside/access_layer/src/sample_code/functional" | ||
| 36 | export KERNEL_SOURCE_ROOT = "${STAGING_KERNEL_DIR}" | ||
| 37 | export ICP_BUILD_OUTPUT = "${D}" | ||
| 38 | export DEST_LIBDIR = "${libdir}" | ||
| 39 | export DEST_BINDIR = "${bindir}" | ||
| 40 | export QAT_KERNEL_VER = "${KERNEL_VERSION}" | ||
| 41 | export SAMPLE_BUILD_OUTPUT = "${D}" | ||
| 42 | export MODULE_DIR = "${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers" | ||
| 43 | |||
| 44 | inherit module | ||
| 45 | inherit update-rc.d | ||
| 46 | INITSCRIPT_NAME = "qat_service" | ||
| 47 | |||
| 48 | PARALLEL_MAKE = "" | ||
| 49 | |||
| 50 | #To get around the double slashes in paths in QAT makefiles | ||
| 51 | PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" | ||
| 52 | |||
| 53 | EXTRA_OEMAKE_append = " CFLAGS+='-fgnu89-inline -fPIC'" | ||
| 54 | EXTRA_OEMAKE = "-e MAKEFLAGS=" | ||
| 55 | do_unpack2() { | ||
| 56 | cd ${S}/ | ||
| 57 | tar xzvf ${ICP_DRIVER_TYPE}.L.${PV}.tar.gz | ||
| 58 | } | ||
| 59 | |||
| 60 | addtask unpack2 after do_unpack before do_patch | ||
| 61 | |||
| 62 | do_compile () { | ||
| 63 | export LD="${CC} -Wl,--hash-style=gnu -nostartfiles -nodefaultlibs" | ||
| 64 | export MACHINE="${TARGET_ARCH}" | ||
| 65 | cd ${S}/quickassist | ||
| 66 | oe_runmake | ||
| 67 | |||
| 68 | cd ${SAMPLE_CODE_DIR} | ||
| 69 | touch ${SAMPLE_CODE_DIR}/performance/compression/calgary | ||
| 70 | touch ${SAMPLE_CODE_DIR}/performance/compression/canterbury | ||
| 71 | |||
| 72 | #build the whole sample code: fips, functional, performance | ||
| 73 | oe_runmake 'all' | ||
| 74 | oe_runmake 'fips_user_code' | ||
| 75 | } | ||
| 76 | |||
| 77 | do_install() { | ||
| 78 | export MACHINE="${TARGET_ARCH}" | ||
| 79 | cd ${S}/quickassist | ||
| 80 | oe_runmake install | ||
| 81 | |||
| 82 | cd ${SAMPLE_CODE_DIR} | ||
| 83 | oe_runmake install | ||
| 84 | |||
| 85 | install -d ${D}/etc/udev/rules.d \ | ||
| 86 | ${D}${includedir} \ | ||
| 87 | ${D}${includedir}/dc \ | ||
| 88 | ${D}${includedir}/lac \ | ||
| 89 | ${D}${sysconfdir}/dh895xcc \ | ||
| 90 | ${D}${base_libdir}/firmware | ||
| 91 | |||
| 92 | echo 'KERNEL=="icp_adf_ctl" MODE="0600"' > ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules | ||
| 93 | echo 'KERNEL=="icp_dev[0-9]*" MODE="0600"' >> ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules | ||
| 94 | echo 'KERNEL=="icp_dev_mem?" MODE="0600"' >> ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules | ||
| 95 | |||
| 96 | install -m 640 ${S}/quickassist/include/*.h ${D}${includedir} | ||
| 97 | install -m 640 ${S}/quickassist/include/dc/*.h ${D}${includedir}/dc/ | ||
| 98 | install -m 640 ${S}/quickassist/include/lac/*.h ${D}${includedir}/lac/ | ||
| 99 | install -m 640 ${S}/quickassist/lookaside/access_layer/include/*.h ${D}${includedir} | ||
| 100 | |||
| 101 | install -m 0755 ${SAMPLE_CODE_DIR}/performance/compression/calgary ${D}${base_libdir}/firmware | ||
| 102 | install -m 0755 ${SAMPLE_CODE_DIR}/performance/compression/canterbury ${D}${base_libdir}/firmware | ||
| 103 | |||
| 104 | install -m 660 ${S}/quickassist/config/dh* ${D}${sysconfdir}/dh895xcc | ||
| 105 | } | ||
| 106 | |||
| 107 | PACKAGES += "${PN}-app" | ||
| 108 | |||
| 109 | FILES_${PN}-dev = "${includedir}" | ||
| 110 | |||
| 111 | FILES_${PN} += "\ | ||
| 112 | ${base_libdir}/firmware/ \ | ||
| 113 | ${sysconfdir}/ \ | ||
| 114 | ${sysconfdir}/udev/rules.d/ \ | ||
| 115 | ${sysconfdir}/init.d/ \ | ||
| 116 | ${libdir}/ \ | ||
| 117 | " | ||
| 118 | |||
| 119 | FILES_${PN}-dbg += "${sysconfdir}/init.d/.debug" | ||
| 120 | |||
| 121 | FILES_${PN}-app += "${bindir}/*" | ||
| 122 | |||
| 123 | EXCLUDE_FROM_WORLD_core2-32-intel-common = "1" | ||
| 124 | |||
| 125 | # Support for 4.14 not yet available | ||
| 126 | python () { | ||
| 127 | if d.getVar("PREFERRED_PROVIDER_virtual/kernel") == "linux-intel" and \ | ||
| 128 | d.getVar("PREFERRED_VERSION_linux-intel") == "4.14%" or \ | ||
| 129 | d.getVar("PREFERRED_PROVIDER_virtual/kernel") == "linux-intel-rt" and \ | ||
| 130 | d.getVar("PREFERRED_VERSION_linux-intel-rt") == "4.14%": | ||
| 131 | raise bb.parse.SkipPackage("This version of QAT has not been tested with Linux Kernel 4.14 or newer.") | ||
| 132 | } | ||
diff --git a/recipes-extended/qat/qat16_2.6.0-65.bb b/recipes-extended/qat/qat16_2.6.0-65.bb deleted file mode 100644 index 88cf66c..0000000 --- a/recipes-extended/qat/qat16_2.6.0-65.bb +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 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 | file://use-CC-for-LD.patch \ | ||
| 7 | " | ||
| 8 | |||
| 9 | SRC_URI_append_libc-musl = " file://0001-OsalServices-Only-use-bits-time-with-GLIBC.patch" | ||
| 10 | |||
| 11 | SRC_URI[qat.md5sum] = "c54e877fb9fbb4690a9bd50793268bcf" | ||
| 12 | SRC_URI[qat.sha256sum] = "872046ffdf02f664d12a56cdb880403d65b914b303b75875707a9eebd9c841f5" | ||
| 13 | |||
| 14 | do_install_append() { | ||
| 15 | install -m 0755 ${SAMPLE_CODE_DIR}/performance/compression/calgary32 ${D}${base_libdir}/firmware | ||
| 16 | } | ||
