From b6c9d76e184c219cca688ad309841084615e315d Mon Sep 17 00:00:00 2001 From: Rahul Kumar Gupta Date: Tue, 12 Apr 2016 18:22:35 +0800 Subject: meta-isg: qat16: update v2.3.0-34 -> v2.6.0-65 * Add recipe for qat16 v2.6.0-65 and retire qat16 v2.3.0-34 with respective patches * Use the version directly in SRC_URI instead of ${PV} since version of qatmux (v2.6.0-60) and qat16 (v2.6.0-65) are no longer same. * Added an install target to makefiles to help install ingredients at a proper path. * Ensure that compiler linker and archiver will override only when it is not defined by the environment. * Override the MACHINE name for do_install. Signed-off-by: Rahul Kumar Gupta Signed-off-by: Saul Wold --- meta-isg/common/recipes-extended/qat/qat16.inc | 1 + ....0-34-qat-add-install-target-to-makefiles.patch | 343 -------------------- ...at-replace-strict_strtoull-with-kstrtoull.patch | 40 --- ....0-65-qat-add-install-target-to-makefiles.patch | 353 +++++++++++++++++++++ ...rride-CC-LD-AR-only-when-it-is-not-define.patch | 35 ++ .../common/recipes-extended/qat/qat16_2.3.0-34.bb | 8 - .../common/recipes-extended/qat/qat16_2.6.0-65.bb | 13 + 7 files changed, 402 insertions(+), 391 deletions(-) delete mode 100644 meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-add-install-target-to-makefiles.patch delete mode 100644 meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-replace-strict_strtoull-with-kstrtoull.patch create mode 100644 meta-isg/common/recipes-extended/qat/qat16/qat16_2.6.0-65-qat-add-install-target-to-makefiles.patch create mode 100644 meta-isg/common/recipes-extended/qat/qat16/qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch delete mode 100644 meta-isg/common/recipes-extended/qat/qat16_2.3.0-34.bb create mode 100644 meta-isg/common/recipes-extended/qat/qat16_2.6.0-65.bb 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 () { } do_install() { + export MACHINE="${TARGET_ARCH}" cd ${S}/quickassist oe_runmake install 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.3.0-34-qat-add-install-target-to-makefiles.patch deleted file mode 100644 index 13e933ec..00000000 --- a/meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-add-install-target-to-makefiles.patch +++ /dev/null @@ -1,343 +0,0 @@ -From 5c47f906182b19eee7a26c5f76b31c9bd5f29c78 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Wed, 8 Jul 2015 11:35:27 +0800 -Subject: [PATCH] qat: add install target to makefiles - -Upstream-Status: Inappropriate [Configuration] - -Added an install target to makefiles to help -install ingredients at a proper path. - -Signed-off-by: Anuj Mittal ---- - quickassist/Makefile | 36 +++++----- - .../access_layer/src/sample_code/Makefile | 18 +++-- - .../src/sample_code/functional/Makefile | 71 +++++++++++--------- - 3 files changed, 71 insertions(+), 54 deletions(-) - -diff --git a/quickassist/Makefile b/quickassist/Makefile -index dcea692..01848e6 100644 ---- a/quickassist/Makefile -+++ b/quickassist/Makefile -@@ -104,7 +104,7 @@ export DRBG_POLL_AND_WAIT=1 - ifdef WITH_CPA_MUX - ALL_TARGETS = clean lac_lib_dir libosal libosal_user qat_mux hal adf adf_user lac lac_user qat-fw install_scripts - else --ALL_TARGETS = clean lac_lib_dir libosal libosal_user hal adf adf_user lac lac_user qat-fw install_scripts -+ALL_TARGETS = clean lac_lib_dir libosal libosal_user hal adf adf_user lac lac_user - endif - ICP_ARCH_USER?=`uname -m` - -@@ -116,7 +116,16 @@ all: $(ALL_TARGETS) - @echo 'Build Done'; - - user: lac_lib_dir libosal_user adf_user lac_user --kernel: lac_lib_dir libosal hal adf lac qat-fw install_scripts -+kernel: lac_lib_dir libosal hal adf lac qat-fw -+ -+install: qat-fw install_scripts -+ @cp $(OSAL_PATH)/src/build/linux_2.6/user_space/libosal.a $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR); -+ @cp $(OSAL_PATH)/src/build/linux_2.6/user_space/libosal.a $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR); -+ @cp $(ADF_PATH)/build/linux_2.6/libadf_proxy.a $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR); -+ @cp $(ADF_PATH)/build/linux_2.6/adf_ctl $(ICP_BUILD_OUTPUT)/etc/init.d/; -+ @cp $(LAC_PATH)/src/build/linux_2.6/kernel_space/$(DRIVER) $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers; -+ @cp $(LAC_PATH)/src/build/linux_2.6/user_space/lib$(BASENAME).a $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR); -+ @cp $(LAC_PATH)/src/build/linux_2.6/user_space/lib$(BASENAME)_s.so $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR); - - install_scripts: - @echo ; echo 'Copying Install Scripts'; -@@ -124,10 +133,10 @@ ifdef WITH_CPA_MUX - @cp $(ICP_BUILDSYSTEM_PATH)/build_files/qat_service_mux $(ICP_BUILD_OUTPUT)/qat_service; - endif - ifndef WITH_CPA_MUX -- @cp $(ICP_BUILDSYSTEM_PATH)/build_files/qat_service $(ICP_BUILD_OUTPUT)/; -+ @cp $(ICP_BUILDSYSTEM_PATH)/build_files/qat_service $(ICP_BUILD_OUTPUT)/etc/init.d; - endif -- @chmod 750 $(ICP_BUILD_OUTPUT)/qat_service; -- @cp $(CONFIG_PATH)/dh895xcc_qa_dev0.conf $(ICP_BUILD_OUTPUT)/; -+ @chmod 750 $(ICP_BUILD_OUTPUT)/etc/init.d/qat_service; -+ @cp $(CONFIG_PATH)/dh895xcc_qa_dev0.conf $(ICP_BUILD_OUTPUT)/etc/; - # @cp $(CONFIG_PATH)/dh89xxcc_qa_dev1.conf $(ICP_BUILD_OUTPUT)/; - # @cp $(CONFIG_PATH)/dh89xxcc_qa_dev0_single_accel.conf $(ICP_BUILD_OUTPUT)/; - -@@ -146,7 +155,6 @@ libosal_user: output_dir lac_lib_dir - @echo ; echo 'Building OSAL for user space'; - @cd $(OSAL_PATH)/src && $(MAKE) ARCH=$(ICP_ARCH_USER) ICP_ENV_DIR=$(ICP_TOP_ENV) OS_LEVEL=linux ICP_OS_LEVEL=user_space lib;\ - echo ; echo 'Copying OSAL library'; -- cp $(OSAL_PATH)/src/build/linux_2.6/user_space/libosal.a $(ICP_BUILD_OUTPUT)/; - - hal: output_dir libosal - @echo ; echo 'Building Hal Libs'; -@@ -171,7 +179,6 @@ libosal_uservf: output_dir lac_lib_dir - @echo ; echo 'Building OSAL for user space'; - @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;\ - echo ; echo 'Copying OSAL library'; -- cp $(OSAL_PATH)/src/build/linux_2.6/user_space/libosal.a $(ICP_BUILD_OUTPUT)/; - - adfvf: output_dir lac_lib_dir libosalvf - @echo ; echo 'Building ADFVF'; -@@ -181,13 +188,10 @@ adfvf: output_dir lac_lib_dir libosalvf - adf_user: output_dir lac_lib_dir libosal_user - @echo ; echo 'Building user ADF'; - @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; -- cp $(ADF_PATH)/build/linux_2.6/libadf_proxy.a $(ICP_BUILD_OUTPUT)/; -- cp $(ADF_PATH)/build/linux_2.6/adf_ctl $(ICP_BUILD_OUTPUT)/; - - lac: output_dir libosal hal adf - @echo ; echo 'Building LAC'; - @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; -- @cp $(LAC_PATH)/src/build/linux_2.6/kernel_space/$(DRIVER) $(ICP_BUILD_OUTPUT)/; - - lacvf: output_dir libosalvf adfvf - @echo ; echo 'Building LACVF'; -@@ -195,20 +199,18 @@ ifdef WITH_CPA_MUX - @cp $(CPA_MUX_PATH)/Module.symvers $(LAC_PATH)/src/ - endif - @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; -- @cp $(LAC_PATH)/src/build/linux_2.6/kernel_space/$(BASENAME)_vf.ko $(ICP_BUILD_OUTPUT)/; - - lac_user: output_dir libosal_user adf_user - @echo ; echo 'Building LAC in user space'; - @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; -- cp $(LAC_PATH)/src/build/linux_2.6/user_space/lib$(BASENAME).a $(ICP_BUILD_OUTPUT)/; - @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; -- cp $(LAC_PATH)/src/build/linux_2.6/user_space/lib$(BASENAME)_s.so $(ICP_BUILD_OUTPUT)/; -+ cp $(LAC_PATH)/src/build/linux_2.6/user_space/lib$(BASENAME)_s.so $(ICP_BUILD_OUTPUT); - - qat-fw: output_dir - @echo ; echo 'Copying QAT-FW Binary'; -- @cp -f $(QAT_FW_PATH)/icp_qat_ae.mof $(ICP_BUILD_OUTPUT)/mof_firmware.bin; -+ @cp -f $(QAT_FW_PATH)/icp_qat_ae.mof $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR)/mof_firmware.bin; - @echo ; echo 'Copying MMP Binary'; -- @cp -f $(QAT_FW_PATH)/icp_qat_pke.mof $(ICP_BUILD_OUTPUT)/mmp_firmware.bin; -+ @cp -f $(QAT_FW_PATH)/icp_qat_pke.mof $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR)/mmp_firmware.bin; - - qat_mux: output_dir libosal - @echo ; echo 'Building qat_mux module' -@@ -244,6 +246,10 @@ endif - - output_dir: - test -d $(ICP_BUILD_OUTPUT) || mkdir -p $(ICP_BUILD_OUTPUT); -+ test -d $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR) || mkdir -p $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR); -+ test -d $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR) || mkdir -p $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR); -+ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers; -+ test -d $(ICP_BUILD_OUTPUT)/etc/init.d || mkdir -p $(ICP_BUILD_OUTPUT)/etc/init.d; - - lac_lib_dir: - test -d $(LAC_LIB_DIR) || mkdir -p $(LAC_LIB_DIR); -diff --git a/quickassist/lookaside/access_layer/src/sample_code/Makefile b/quickassist/lookaside/access_layer/src/sample_code/Makefile -index 91c7373..8c6901a 100644 ---- a/quickassist/lookaside/access_layer/src/sample_code/Makefile -+++ b/quickassist/lookaside/access_layer/src/sample_code/Makefile -@@ -95,6 +95,7 @@ SAMPLE_PATH?=$(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code - PERF_PATH?=$(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code/performance - FIPS_PATH?=$(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code/fips - FUNC_PATH=$(SAMPLE_PATH)/functional -+FIPS_OUTPUT_NAME=fips_sample - - #include the makefile with all the default and common Make variable definitions - include $(ICP_BUILDSYSTEM_PATH)/build_files/common.mk -@@ -106,6 +107,8 @@ SAMPLE_BUILD_OUTPUT?=$(SAMPLE_PATH)/build - - output_dir: - test -d $(SAMPLE_BUILD_OUTPUT) || mkdir $(SAMPLE_BUILD_OUTPUT); -+ test -d $(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR) || mkdir -p $(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR) -+ - fips_code: - @if test -d $(FIPS_PATH); then echo ; echo 'Building FIPS Code'; fi; - @if test -d $(FIPS_PATH); \ -@@ -157,17 +160,13 @@ PERF_ALL=$(MEM_DRIVER) perf_user perf_kernel - perf_all: $(PERF_ALL) - @echo ; echo "Build output location $(SAMPLE_BUILD_OUTPUT)"; - -- - perf_user: output_dir - @echo ; echo "Building perf_user"; - @cd $(PERF_PATH) && $(MAKE) clean ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=user_space lib_shared exe -- @cp $(PERF_PATH)/build/linux_2.6/user_space/$(PERF_OUTPUT_NAME)_s.so $(SAMPLE_BUILD_OUTPUT)/; -- @cp $(PERF_PATH)/build/linux_2.6/user_space/$(PERF_OUTPUT_NAME) $(SAMPLE_BUILD_OUTPUT)/; - - perf_kernel: output_dir - @echo ; echo "Building perf_kernel"; - @cd $(PERF_PATH) && $(MAKE) ICP_OS_LEVEL=kernel_space -- @cp $(PERF_PATH)/build/linux_2.6/$(ICP_OS_LEVEL)/$(PERF_OUTPUT_NAME).ko $(SAMPLE_BUILD_OUTPUT)/; - - common_mem_drv: output_dir - @echo ; echo "Building common_mem_drv kernel space"; -@@ -180,12 +179,19 @@ common_mem_drv: output_dir - perf_qae: output_dir - @echo ; echo "Building perf_qae"; - @cd $(CMN_ROOT)/linux/kernel_space && $(MAKE) ICP_OS_LEVEL=kernel_space -- @cp $(CMN_ROOT)/linux/kernel_space/build/linux_2.6/$(ICP_OS_LEVEL)/$(CMN_MODULE_NAME).ko $(SAMPLE_BUILD_OUTPUT)/; -- - - func: output_dir - @cd $(FUNC_PATH) && $(MAKE) all; - -+install: output_dir -+ @cp $(PERF_PATH)/build/linux_2.6/user_space/$(PERF_OUTPUT_NAME)_s.so $(SAMPLE_BUILD_OUTPUT)$(DEST_LIBDIR); -+ @cp $(PERF_PATH)/build/linux_2.6/user_space/$(PERF_OUTPUT_NAME) $(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR); -+ @cp $(PERF_PATH)/build/linux_2.6/$(ICP_OS_LEVEL)/$(PERF_OUTPUT_NAME).ko $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers; -+ @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; -+ @cp $(FIPS_PATH)/build/linux_2.6/$(ICP_OS_LEVEL)/$(FIPS_OUTPUT_NAME).ko $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers; -+ @cp $(FIPS_PATH)/build/linux_2.6/user_space/$(FIPS_OUTPUT_NAME)_s.so $(SAMPLE_BUILD_OUTPUT)$(DEST_LIBDIR); -+ @cp $(FIPS_PATH)/build/linux_2.6/user_space/$(FIPS_OUTPUT_NAME).a $(SAMPLE_BUILD_OUTPUT)$(DEST_LIBDIR); -+ @cd $(FUNC_PATH) && $(MAKE) install; - - all: $(MEM_DRIVER) fips_code perf_user perf_kernel func - perf: $(MEM_DRIVER) perf_kernel -diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile -index 8944883..0355a70 100644 ---- a/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile -+++ b/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile -@@ -64,6 +64,8 @@ SYM_PATH?=$(SAMPLE_PATH)/sym - ASYM_PATH?=$(SAMPLE_PATH)/asym - ICP_API_DIR?=$(ICP_ROOT)/quickassist/include/ - ICP_LAC_DIR?=$(ICP_ROOT)/quickassist/lookaside/access_layer/ -+BIN_INSTALLPATH=$(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR)/ -+MODULE_INSTALLPATH=$(SAMPLE_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers - - ifeq ($(WITH_CMDRV),1) - CMN_ROOT?=$(ICP_ROOT)/quickassist/utilities/libqae_mem/ -@@ -110,6 +112,7 @@ SAMPLE_BUILD_OUTPUT?=$(SAMPLE_PATH)/build - - output_dir: - test -d $(SAMPLE_BUILD_OUTPUT) || mkdir $(SAMPLE_BUILD_OUTPUT); -+ test -d $(BIN_INSTALLPATH) || mkdir -p $(BIN_INSTALLPATH); - - BUILD_DC=dc_dp_sample stateless_sample stateful_sample \ - stateless_multi_op_checksum_sample -@@ -119,23 +122,15 @@ dc: $(BUILD_DC) - - dc_dp_sample: output_dir - @cd $(DC_PATH)/dc_dp_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space -- @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample $(SAMPLE_BUILD_OUTPUT)/; -- @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample.ko $(SAMPLE_BUILD_OUTPUT)/; - - stateless_sample: output_dir - @cd $(DC_PATH)/stateless_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space -- @cp $(DC_PATH)/stateless_sample/dc_stateless_sample.ko $(SAMPLE_BUILD_OUTPUT)/; -- @cp $(DC_PATH)/stateless_sample/dc_stateless_sample $(SAMPLE_BUILD_OUTPUT)/; - - stateful_sample: output_dir - @cd $(DC_PATH)/stateful_sample && $(MAKE) clean ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=user_space -- @cp $(DC_PATH)/stateful_sample/dc_stateful_sample $(SAMPLE_BUILD_OUTPUT)/; -- @cp $(DC_PATH)/stateful_sample/paper4 $(SAMPLE_BUILD_OUTPUT)/; - - stateless_multi_op_checksum_sample: output_dir - @cd $(DC_PATH)/stateless_multi_op_checksum_sample && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space -- @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample.ko $(SAMPLE_BUILD_OUTPUT)/; -- @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample $(SAMPLE_BUILD_OUTPUT)/; - - BUILD_SYN=algchaining_sample ccm_sample cipher_sample \ - drbg_sample gcm_sample hash_file_sample \ -@@ -146,57 +141,36 @@ sym:$(BUILD_SYN) - @echo ; echo "Build sym component"; - algchaining_sample: output_dir - @cd $(SYM_PATH)/alg_chaining_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space -- @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample.ko $(SAMPLE_BUILD_OUTPUT)/; -- @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample $(SAMPLE_BUILD_OUTPUT)/; - - ccm_sample: output_dir - @cd $(SYM_PATH)/ccm_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space -- @cp $(SYM_PATH)/ccm_sample/ccm_sample.ko $(SAMPLE_BUILD_OUTPUT)/; -- @cp $(SYM_PATH)/ccm_sample/ccm_sample $(SAMPLE_BUILD_OUTPUT)/; - - cipher_sample: output_dir - @cd $(SYM_PATH)/cipher_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space -- @cp $(SYM_PATH)/cipher_sample/cipher_sample.ko $(SAMPLE_BUILD_OUTPUT)/; -- @cp $(SYM_PATH)/cipher_sample/cipher_sample $(SAMPLE_BUILD_OUTPUT)/; - - drbg_sample: output_dir - @cd $(SYM_PATH)/drbg_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space -- @cp $(SYM_PATH)/drbg_sample/drbg_sample.ko $(SAMPLE_BUILD_OUTPUT)/; -- @cp $(SYM_PATH)/drbg_sample/drbg_sample $(SAMPLE_BUILD_OUTPUT)/; - - gcm_sample: output_dir - @cd $(SYM_PATH)/gcm_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space -- @cp $(SYM_PATH)/gcm_sample/gcm_sample.ko $(SAMPLE_BUILD_OUTPUT)/; -- @cp $(SYM_PATH)/gcm_sample/gcm_sample $(SAMPLE_BUILD_OUTPUT)/; - - hash_file_sample: output_dir - @cd $(SYM_PATH)/hash_file_sample && $(MAKE) clean ICP_OS_LEVEL=user_space&& $(MAKE) ICP_OS_LEVEL=user_space -- @cp $(SYM_PATH)/hash_file_sample/hash_file_sample $(SAMPLE_BUILD_OUTPUT)/; - - hash_sample: output_dir - @cd $(SYM_PATH)/hash_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space -- @cp $(SYM_PATH)/hash_sample/hash_sample.ko $(SAMPLE_BUILD_OUTPUT)/; -- @cp $(SYM_PATH)/hash_sample/hash_sample $(SAMPLE_BUILD_OUTPUT)/; - - ipsec_sample: output_dir - @cd $(SYM_PATH)/ipsec_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space -- @cp $(SYM_PATH)/ipsec_sample/ipsec_sample.ko $(SAMPLE_BUILD_OUTPUT)/; -- @cp $(SYM_PATH)/ipsec_sample/ipsec_sample $(SAMPLE_BUILD_OUTPUT)/; - - nrbg_sample: output_dir - @cd $(SYM_PATH)/nrbg_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space -- @cp $(SYM_PATH)/nrbg_sample/nrbg_sample $(SAMPLE_BUILD_OUTPUT)/; -- @cp $(SYM_PATH)/nrbg_sample/nrbg_sample.ko $(SAMPLE_BUILD_OUTPUT)/; - - ssl_sample: output_dir - @cd $(SYM_PATH)/ssl_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space -- @cp $(SYM_PATH)/ssl_sample/ssl_sample.ko $(SAMPLE_BUILD_OUTPUT)/; -- @cp $(SYM_PATH)/ssl_sample/ssl_sample $(SAMPLE_BUILD_OUTPUT)/; - - sym_dp_sample: output_dir - @cd $(SYM_PATH)/symdp_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space -- @cp $(SYM_PATH)/symdp_sample/sym_dp_sample.ko $(SAMPLE_BUILD_OUTPUT)/; -- @cp $(SYM_PATH)/symdp_sample/sym_dp_sample $(SAMPLE_BUILD_OUTPUT)/; - - BUILD_ASYM=diffie_hellman_sample prime_sample - -@@ -205,13 +179,44 @@ asym: $(BUILD_ASYM) - - diffie_hellman_sample: output_dir - @cd $(ASYM_PATH)/diffie_hellman_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space -- @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample.ko $(SAMPLE_BUILD_OUTPUT)/; -- @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample $(SAMPLE_BUILD_OUTPUT)/; - - prime_sample: output_dir - @cd $(ASYM_PATH)/prime_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=kernel_space -- @cp $(ASYM_PATH)/prime_sample/prime_sample.ko $(SAMPLE_BUILD_OUTPUT)/; -- @cp $(ASYM_PATH)/prime_sample/prime_sample $(SAMPLE_BUILD_OUTPUT)/; -+ -+install: output_dir -+ @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample.ko $(MODULE_INSTALLPATH); -+ @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample $(BIN_INSTALLPATH); -+ @cp $(DC_PATH)/stateful_sample/dc_stateful_sample $(BIN_INSTALLPATH); -+ @cp $(DC_PATH)/stateful_sample/paper4 $(BIN_INSTALLPATH); -+ @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample $(BIN_INSTALLPATH); -+ @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample.ko $(MODULE_INSTALLPATH); -+ @cp $(DC_PATH)/stateless_sample/dc_stateless_sample.ko $(MODULE_INSTALLPATH); -+ @cp $(DC_PATH)/stateless_sample/dc_stateless_sample $(BIN_INSTALLPATH); -+ @cp $(ASYM_PATH)/prime_sample/prime_sample.ko $(MODULE_INSTALLPATH); -+ @cp $(ASYM_PATH)/prime_sample/prime_sample $(BIN_INSTALLPATH); -+ @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample.ko $(MODULE_INSTALLPATH); -+ @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample $(BIN_INSTALLPATH); -+ @cp $(SYM_PATH)/symdp_sample/sym_dp_sample.ko $(MODULE_INSTALLPATH); -+ @cp $(SYM_PATH)/symdp_sample/sym_dp_sample $(BIN_INSTALLPATH); -+ @cp $(SYM_PATH)/ssl_sample/ssl_sample.ko $(MODULE_INSTALLPATH); -+ @cp $(SYM_PATH)/ssl_sample/ssl_sample $(BIN_INSTALLPATH); -+ @cp $(SYM_PATH)/nrbg_sample/nrbg_sample $(BIN_INSTALLPATH); -+ @cp $(SYM_PATH)/nrbg_sample/nrbg_sample.ko $(MODULE_INSTALLPATH); -+ @cp $(SYM_PATH)/ipsec_sample/ipsec_sample.ko $(MODULE_INSTALLPATH); -+ @cp $(SYM_PATH)/hash_file_sample/hash_file_sample $(BIN_INSTALLPATH); -+ @cp $(SYM_PATH)/ipsec_sample/ipsec_sample $(BIN_INSTALLPATH); -+ @cp $(SYM_PATH)/hash_sample/hash_sample.ko $(MODULE_INSTALLPATH); -+ @cp $(SYM_PATH)/hash_sample/hash_sample $(BIN_INSTALLPATH); -+ @cp $(SYM_PATH)/gcm_sample/gcm_sample.ko $(MODULE_INSTALLPATH); -+ @cp $(SYM_PATH)/gcm_sample/gcm_sample $(BIN_INSTALLPATH); -+ @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample.ko $(MODULE_INSTALLPATH); -+ @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample $(BIN_INSTALLPATH); -+ @cp $(SYM_PATH)/ccm_sample/ccm_sample.ko $(MODULE_INSTALLPATH); -+ @cp $(SYM_PATH)/ccm_sample/ccm_sample $(BIN_INSTALLPATH); -+ @cp $(SYM_PATH)/drbg_sample/drbg_sample.ko $(MODULE_INSTALLPATH); -+ @cp $(SYM_PATH)/drbg_sample/drbg_sample $(BIN_INSTALLPATH); -+ @cp $(SYM_PATH)/cipher_sample/cipher_sample.ko $(MODULE_INSTALLPATH); -+ @cp $(SYM_PATH)/cipher_sample/cipher_sample $(BIN_INSTALLPATH); - - CLEAN_DC=clean_dc_dp_sample clean_stateless_sample \ - clean_stateful_sample \ --- -1.7.9.5 - 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 @@ -From 4ef0e0124f73b3bc24b2f2a772d83176aaa9fb3f Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Tue, 8 Sep 2015 11:53:36 +0800 -Subject: [PATCH] qat: replace strict_strtoull with kstrtoull - -Upstream-Status: Backport - -strict_strtoull() has been removed starting kernel v3.18. -Hence, replace the usage with kstrtoull(). - -Signed-off-by: Anuj Mittal ---- - .../uclo/include/linux/uclo_platform.h | 4 ++++ - 1 file changed, 4 insertions(+) - -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 -index a4bf903..ee3e2d8 100755 ---- a/quickassist/utilities/downloader/Target_CoreLibs/uclo/include/linux/uclo_platform.h -+++ b/quickassist/utilities/downloader/Target_CoreLibs/uclo/include/linux/uclo_platform.h -@@ -116,6 +116,9 @@ - /* 32-bit/64-bit 2.6.29 kernel does not export simple_strtoll */ - #define STR_TO_32(str, base, num, endPtr) {*(num) = (int)simple_strtol((str), &(endPtr), (base));} - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) -+#define STR_TO_64(str, base, num, endPtr) {endPtr=NULL; if (kstrtoull((str), (base), (num))) printk("Error strtoull convert %s\n", str); } -+#else - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38) - #define STR_TO_64(str, base, num, endPtr) {endPtr=NULL; if (strict_strtoull((str), (base), (num))) printk("Error strtoull convert %s\n", str); } - #else -@@ -133,6 +136,7 @@ - } while(0) - #endif - #endif -+#endif - - int aToi(const char *pStr); - --- -1.7.9.5 - diff --git a/meta-isg/common/recipes-extended/qat/qat16/qat16_2.6.0-65-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 new file mode 100644 index 00000000..39600228 --- /dev/null +++ b/meta-isg/common/recipes-extended/qat/qat16/qat16_2.6.0-65-qat-add-install-target-to-makefiles.patch @@ -0,0 +1,353 @@ +From f53aeef0ae6a89066cca8c9a9154e70408f6ef68 Mon Sep 17 00:00:00 2001 +From: Rahul Kumar Gupta +Date: Thu, 24 Mar 2016 01:11:02 +0800 +Subject: [PATCH] qat: add install target to makefiles + +Upstream-Status: Inappropriate [Configuration] + +Added an install target to makefiles to help +install ingredients at a proper path. + +Signed-off-by: Rahul Kumar Gupta +--- + quickassist/Makefile | 29 ++++++--- + .../access_layer/src/sample_code/Makefile | 19 ++++-- + .../src/sample_code/functional/Makefile | 74 ++++++++++++---------- + 3 files changed, 75 insertions(+), 47 deletions(-) + +diff --git a/quickassist/Makefile b/quickassist/Makefile +index 6c5d436..0a1ee4c 100644 +--- a/quickassist/Makefile ++++ b/quickassist/Makefile +@@ -109,7 +109,7 @@ ifdef WITH_CPA_MUX + ALL_TARGETS = clean lac_lib_dir libosal libosal_user qat_mux hal adf adf_user lac lac_user qat-fw install_scripts + ALL_TARGETS_CI = lac_lib_dir qat_mux_ci lac_ci lac_user_ci qat-fw install_scripts + else +-ALL_TARGETS = clean lac_lib_dir libosal libosal_user hal adf adf_user lac lac_user qat-fw install_scripts ++ALL_TARGETS = clean lac_lib_dir libosal libosal_user hal adf adf_user lac lac_user + ALL_TARGETS_CI = lac_lib_dir lac_ci lac_user_ci qat-fw install_scripts + endif + ICP_ARCH_USER?=`uname -m` +@@ -125,7 +125,16 @@ all_ci: $(ALL_TARGETS_CI) + @echo 'Build Done'; + + user: lac_lib_dir libosal_user adf_user lac_user +-kernel: lac_lib_dir libosal hal adf lac qat-fw install_scripts ++kernel: lac_lib_dir libosal hal adf lac qat-fw ++ ++install: qat-fw install_scripts ++ @cp $(OSAL_PATH)/src/build/linux_2.6/user_space/libosal.a $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR); ++ @cp $(OSAL_PATH)/src/build/linux_2.6/user_space/libosal.a $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR); ++ @cp $(ADF_PATH)/build/linux_2.6/libadf_proxy.a $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR); ++ @cp $(ADF_PATH)/build/linux_2.6/adf_ctl $(ICP_BUILD_OUTPUT)/etc/init.d/; ++ @cp $(LAC_PATH)/src/build/linux_2.6/kernel_space/$(DRIVER) $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers; ++ @cp $(LAC_PATH)/src/build/linux_2.6/user_space/lib$(BASENAME).a $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR); ++ @cp $(LAC_PATH)/src/build/linux_2.6/user_space/lib$(BASENAME)_s.so $(ICP_BUILD_OUTPUT)/$(DEST_LIBDIR); + + install_scripts: + @echo ; echo 'Copying Install Scripts'; +@@ -133,10 +142,10 @@ ifdef WITH_CPA_MUX + @cp $(ICP_BUILDSYSTEM_PATH)/build_files/qat_service_mux $(ICP_BUILD_OUTPUT)/qat_service; + endif + ifndef WITH_CPA_MUX +- @cp $(ICP_BUILDSYSTEM_PATH)/build_files/qat_service $(ICP_BUILD_OUTPUT)/; ++ @cp $(ICP_BUILDSYSTEM_PATH)/build_files/qat_service $(ICP_BUILD_OUTPUT)/etc/init.d; + endif +- @chmod 750 $(ICP_BUILD_OUTPUT)/qat_service; +- @cp $(CONFIG_PATH)/dh895xcc_qa_dev0.conf $(ICP_BUILD_OUTPUT)/; ++ @chmod 750 $(ICP_BUILD_OUTPUT)/etc/init.d/qat_service; ++ @cp $(CONFIG_PATH)/dh895xcc_qa_dev0.conf $(ICP_BUILD_OUTPUT)/etc/; + # @cp $(CONFIG_PATH)/dh89xxcc_qa_dev1.conf $(ICP_BUILD_OUTPUT)/; + # @cp $(CONFIG_PATH)/dh89xxcc_qa_dev0_single_accel.conf $(ICP_BUILD_OUTPUT)/; + +@@ -233,7 +242,7 @@ lac_user: output_dir libosal_user adf_user + @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; + cp $(LAC_PATH)/src/build/linux_2.6/user_space/lib$(BASENAME).a $(ICP_BUILD_OUTPUT)/; + @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; +- cp $(LAC_PATH)/src/build/linux_2.6/user_space/lib$(BASENAME)_s.so $(ICP_BUILD_OUTPUT)/; ++ cp $(LAC_PATH)/src/build/linux_2.6/user_space/lib$(BASENAME)_s.so $(ICP_BUILD_OUTPUT); + + lac_user_ci: output_dir + @echo ; echo 'Building LAC in user space'; +@@ -244,9 +253,9 @@ lac_user_ci: output_dir + + qat-fw: output_dir + @echo ; echo 'Copying QAT-FW Binary'; +- @cp -f $(QAT_FW_PATH)/icp_qat_ae.mof $(ICP_BUILD_OUTPUT)/mof_firmware.bin; ++ @cp -f $(QAT_FW_PATH)/icp_qat_ae.mof $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR)/mof_firmware.bin; + @echo ; echo 'Copying MMP Binary'; +- @cp -f $(QAT_FW_PATH)/icp_qat_pke.mof $(ICP_BUILD_OUTPUT)/mmp_firmware.bin; ++ @cp -f $(QAT_FW_PATH)/icp_qat_pke.mof $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR)/mmp_firmware.bin; + + qat_mux: output_dir libosal + @echo ; echo 'Building qat_mux module' +@@ -306,6 +315,10 @@ endif + + output_dir: + test -d $(ICP_BUILD_OUTPUT) || mkdir -p $(ICP_BUILD_OUTPUT); ++ test -d $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR) || mkdir -p $(ICP_BUILD_OUTPUT)$(DEST_LIBDIR); ++ test -d $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR) || mkdir -p $(ICP_BUILD_OUTPUT)/lib/firmware/$(ICP_FIRMWARE_DIR); ++ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers; ++ test -d $(ICP_BUILD_OUTPUT)/etc/init.d || mkdir -p $(ICP_BUILD_OUTPUT)/etc/init.d; + + lac_lib_dir: + test -d $(LAC_LIB_DIR) || mkdir -p $(LAC_LIB_DIR); +diff --git a/quickassist/lookaside/access_layer/src/sample_code/Makefile b/quickassist/lookaside/access_layer/src/sample_code/Makefile +index c66ecfb..4cc3dbf 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/Makefile +@@ -89,6 +89,7 @@ SAMPLE_PATH?=$(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code + PERF_PATH?=$(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code/performance + FIPS_PATH?=$(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code/fips + FUNC_PATH=$(SAMPLE_PATH)/functional ++FIPS_OUTPUT_NAME=fips_sample + + #include the makefile with all the default and common Make variable definitions + include $(ICP_BUILDSYSTEM_PATH)/build_files/common.mk +@@ -100,6 +101,8 @@ SAMPLE_BUILD_OUTPUT?=$(SAMPLE_PATH)/build + + output_dir: + test -d $(SAMPLE_BUILD_OUTPUT) || mkdir $(SAMPLE_BUILD_OUTPUT); ++ test -d $(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR) || mkdir -p $(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR) ++ + fips_code: + @if test -d $(FIPS_PATH); then echo ; echo 'Building FIPS Code'; fi; + @if test -d $(FIPS_PATH); \ +@@ -154,14 +157,11 @@ perf_all: $(PERF_ALL) + perf_user: output_dir + @echo ; echo "Building perf_user"; + @cd $(PERF_PATH) && $(MAKE) clean ICP_OS_LEVEL=user_space && $(MAKE) ARCH=$(ICP_ARCH_USER) ICP_OS_LEVEL=user_space lib_shared exe +- @cp $(PERF_PATH)/build/linux_2.6/user_space/$(PERF_OUTPUT_NAME)_s.so $(SAMPLE_BUILD_OUTPUT)/; +- @cp $(PERF_PATH)/build/linux_2.6/user_space/$(PERF_OUTPUT_NAME) $(SAMPLE_BUILD_OUTPUT)/; + + perf_kernel: output_dir + @echo ; echo "Building perf_kernel"; + @cd $(PERF_PATH) && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(PERF_PATH)/build/linux_2.6/$(ICP_OS_LEVEL)/$(PERF_OUTPUT_NAME).ko $(SAMPLE_BUILD_OUTPUT)/; +- ++ + common_mem_drv_kernel: output_dir + @echo ; echo "Building common_mem_drv kernel space"; + @cd $(CMN_ROOT) && $(MAKE) ICP_OS_LEVEL=user_space cm_kernel +@@ -175,12 +175,19 @@ common_mem_drv_user: output_dir + perf_qae: output_dir + @echo ; echo "Building perf_qae"; + @cd $(CMN_ROOT)/linux/kernel_space && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(CMN_ROOT)/linux/kernel_space/build/linux_2.6/$(ICP_OS_LEVEL)/$(CMN_MODULE_NAME).ko $(SAMPLE_BUILD_OUTPUT)/; +- + + func: output_dir + @cd $(FUNC_PATH) && $(MAKE) all; + ++install: output_dir ++ @cp $(PERF_PATH)/build/linux_2.6/user_space/$(PERF_OUTPUT_NAME)_s.so $(SAMPLE_BUILD_OUTPUT)$(DEST_LIBDIR); ++ @cp $(PERF_PATH)/build/linux_2.6/user_space/$(PERF_OUTPUT_NAME) $(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR); ++ @cp $(PERF_PATH)/build/linux_2.6/$(ICP_OS_LEVEL)/$(PERF_OUTPUT_NAME).ko $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers; ++ @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; ++ @cp $(FIPS_PATH)/build/linux_2.6/$(ICP_OS_LEVEL)/$(FIPS_OUTPUT_NAME).ko $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers; ++ @cp $(FIPS_PATH)/build/linux_2.6/user_space/$(FIPS_OUTPUT_NAME)_s.so $(SAMPLE_BUILD_OUTPUT)$(DEST_LIBDIR); ++ @cp $(FIPS_PATH)/build/linux_2.6/user_space/$(FIPS_OUTPUT_NAME).a $(SAMPLE_BUILD_OUTPUT)$(DEST_LIBDIR); ++ @cd $(FUNC_PATH) && $(MAKE) install; + + all: $(MEM_DRIVER) fips_code perf_user perf_kernel func + perf: $(MEM_DRIVER) perf_kernel +diff --git a/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile b/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile +index 3208acf..41754e8 100644 +--- a/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile ++++ b/quickassist/lookaside/access_layer/src/sample_code/functional/Makefile +@@ -64,6 +64,8 @@ SYM_PATH?=$(SAMPLE_PATH)/sym + ASYM_PATH?=$(SAMPLE_PATH)/asym + ICP_API_DIR?=$(ICP_ROOT)/quickassist/include/ + ICP_LAC_DIR?=$(ICP_ROOT)/quickassist/lookaside/access_layer/ ++BIN_INSTALLPATH=$(SAMPLE_BUILD_OUTPUT)$(DEST_BINDIR)/ ++MODULE_INSTALLPATH=$(SAMPLE_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/kernel/drivers + + CMN_ROOT?=$(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code/performance/qae/ + CMN_MODULE_NAME?=qaeMemDrv +@@ -105,6 +107,7 @@ SAMPLE_BUILD_OUTPUT?=$(SAMPLE_PATH)/build + + output_dir: + test -d $(SAMPLE_BUILD_OUTPUT) || mkdir $(SAMPLE_BUILD_OUTPUT); ++ test -d $(BIN_INSTALLPATH) || mkdir -p $(BIN_INSTALLPATH); + + BUILD_DC=dc_dp_sample stateless_sample stateful_sample \ + stateless_multi_op_checksum_sample +@@ -114,31 +117,23 @@ dc: $(BUILD_DC) + + dc_dp_sample: output_dir + @cd $(DC_PATH)/dc_dp_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space +- @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample $(SAMPLE_BUILD_OUTPUT)/; + ifneq ($(WITH_UPSTREAM),1) + @cd $(DC_PATH)/dc_dp_sample && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample.ko $(SAMPLE_BUILD_OUTPUT)/; + endif + + stateless_sample: output_dir + @cd $(DC_PATH)/stateless_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space +- @cp $(DC_PATH)/stateless_sample/dc_stateless_sample $(SAMPLE_BUILD_OUTPUT)/; + ifneq ($(WITH_UPSTREAM),1) + @cd $(DC_PATH)/stateless_sample && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(DC_PATH)/stateless_sample/dc_stateless_sample.ko $(SAMPLE_BUILD_OUTPUT)/; + endif + + stateful_sample: output_dir + @cd $(DC_PATH)/stateful_sample && $(MAKE) clean ICP_OS_LEVEL=user_space && $(MAKE) ICP_OS_LEVEL=user_space +- @cp $(DC_PATH)/stateful_sample/dc_stateful_sample $(SAMPLE_BUILD_OUTPUT)/; +- @cp $(DC_PATH)/stateful_sample/paper4 $(SAMPLE_BUILD_OUTPUT)/; + + stateless_multi_op_checksum_sample: output_dir + @cd $(DC_PATH)/stateless_multi_op_checksum_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space +- @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample $(SAMPLE_BUILD_OUTPUT)/; + ifneq ($(WITH_UPSTREAM),1) + @cd $(DC_PATH)/stateless_multi_op_checksum_sample && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample.ko $(SAMPLE_BUILD_OUTPUT)/; + endif + + BUILD_SYN=algchaining_sample ccm_sample cipher_sample \ +@@ -154,86 +149,65 @@ sym:$(BUILD_SYN) + @echo ; echo "Build sym component"; + algchaining_sample: output_dir + @cd $(SYM_PATH)/alg_chaining_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space +- @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample $(SAMPLE_BUILD_OUTPUT)/; + ifneq ($(WITH_UPSTREAM),1) + @cd $(SYM_PATH)/alg_chaining_sample && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample.ko $(SAMPLE_BUILD_OUTPUT)/; + endif + + ccm_sample: output_dir + @cd $(SYM_PATH)/ccm_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space +- @cp $(SYM_PATH)/ccm_sample/ccm_sample $(SAMPLE_BUILD_OUTPUT)/; + ifneq ($(WITH_UPSTREAM),1) + @cd $(SYM_PATH)/ccm_sample && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(SYM_PATH)/ccm_sample/ccm_sample.ko $(SAMPLE_BUILD_OUTPUT)/; + endif + + cipher_sample: output_dir + @cd $(SYM_PATH)/cipher_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space +- @cp $(SYM_PATH)/cipher_sample/cipher_sample $(SAMPLE_BUILD_OUTPUT)/; + ifneq ($(WITH_UPSTREAM),1) + @cd $(SYM_PATH)/cipher_sample && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(SYM_PATH)/cipher_sample/cipher_sample.ko $(SAMPLE_BUILD_OUTPUT)/; + endif + + drbg_sample: output_dir + @cd $(SYM_PATH)/drbg_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space +- @cp $(SYM_PATH)/drbg_sample/drbg_sample $(SAMPLE_BUILD_OUTPUT)/; + ifneq ($(WITH_UPSTREAM),1) + @cd $(SYM_PATH)/drbg_sample && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(SYM_PATH)/drbg_sample/drbg_sample.ko $(SAMPLE_BUILD_OUTPUT)/; + endif + + gcm_sample: output_dir + @cd $(SYM_PATH)/gcm_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space +- @cp $(SYM_PATH)/gcm_sample/gcm_sample $(SAMPLE_BUILD_OUTPUT)/; + ifneq ($(WITH_UPSTREAM),1) + @cd $(SYM_PATH)/gcm_sample && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(SYM_PATH)/gcm_sample/gcm_sample.ko $(SAMPLE_BUILD_OUTPUT)/; + endif + + hash_file_sample: output_dir + @cd $(SYM_PATH)/hash_file_sample && $(MAKE) clean ICP_OS_LEVEL=user_space&& $(MAKE) ICP_OS_LEVEL=user_space +- @cp $(SYM_PATH)/hash_file_sample/hash_file_sample $(SAMPLE_BUILD_OUTPUT)/; + + hash_sample: output_dir + @cd $(SYM_PATH)/hash_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space +- @cp $(SYM_PATH)/hash_sample/hash_sample $(SAMPLE_BUILD_OUTPUT)/; + ifneq ($(WITH_UPSTREAM),1) + @cd $(SYM_PATH)/hash_sample && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(SYM_PATH)/hash_sample/hash_sample.ko $(SAMPLE_BUILD_OUTPUT)/; + endif + + ipsec_sample: output_dir + @cd $(SYM_PATH)/ipsec_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space +- @cp $(SYM_PATH)/ipsec_sample/ipsec_sample $(SAMPLE_BUILD_OUTPUT)/; + ifneq ($(WITH_UPSTREAM),1) + @cd $(SYM_PATH)/ipsec_sample && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(SYM_PATH)/ipsec_sample/ipsec_sample.ko $(SAMPLE_BUILD_OUTPUT)/; + endif + + nrbg_sample: output_dir + @cd $(SYM_PATH)/nrbg_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space +- @cp $(SYM_PATH)/nrbg_sample/nrbg_sample $(SAMPLE_BUILD_OUTPUT)/; + ifneq ($(WITH_UPSTREAM),1) + @cd $(SYM_PATH)/nrbg_sample && $(MAKE) && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(SYM_PATH)/nrbg_sample/nrbg_sample.ko $(SAMPLE_BUILD_OUTPUT)/; + endif + + ssl_sample: output_dir + @cd $(SYM_PATH)/ssl_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space +- @cp $(SYM_PATH)/ssl_sample/ssl_sample $(SAMPLE_BUILD_OUTPUT)/; + ifneq ($(WITH_UPSTREAM),1) + @cd $(SYM_PATH)/ssl_sample && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(SYM_PATH)/ssl_sample/ssl_sample.ko $(SAMPLE_BUILD_OUTPUT)/; + endif + + sym_dp_sample: output_dir + @cd $(SYM_PATH)/symdp_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space +- @cp $(SYM_PATH)/symdp_sample/sym_dp_sample $(SAMPLE_BUILD_OUTPUT)/; + ifneq ($(WITH_UPSTREAM),1) + @cd $(SYM_PATH)/symdp_sample && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(SYM_PATH)/symdp_sample/sym_dp_sample.ko $(SAMPLE_BUILD_OUTPUT)/; + endif + + BUILD_ASYM=diffie_hellman_sample prime_sample +@@ -243,18 +217,52 @@ asym: $(BUILD_ASYM) + + diffie_hellman_sample: output_dir + @cd $(ASYM_PATH)/diffie_hellman_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space +- @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample $(SAMPLE_BUILD_OUTPUT)/; + ifneq ($(WITH_UPSTREAM),1) + @cd $(ASYM_PATH)/diffie_hellman_sample && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample.ko $(SAMPLE_BUILD_OUTPUT)/; + endif + + prime_sample: output_dir + @cd $(ASYM_PATH)/prime_sample && $(MAKE) clean && $(MAKE) ICP_OS_LEVEL=user_space +- @cp $(ASYM_PATH)/prime_sample/prime_sample $(SAMPLE_BUILD_OUTPUT)/; + ifneq ($(WITH_UPSTREAM),1) + @cd $(ASYM_PATH)/prime_sample && $(MAKE) ICP_OS_LEVEL=kernel_space +- @cp $(ASYM_PATH)/prime_sample/prime_sample.ko $(SAMPLE_BUILD_OUTPUT)/; ++endif ++ ++install: output_dir ++ @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample $(BIN_INSTALLPATH); ++ @cp $(DC_PATH)/stateful_sample/dc_stateful_sample $(BIN_INSTALLPATH); ++ @cp $(DC_PATH)/stateful_sample/paper4 $(BIN_INSTALLPATH); ++ @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample $(BIN_INSTALLPATH); ++ @cp $(DC_PATH)/stateless_sample/dc_stateless_sample $(BIN_INSTALLPATH); ++ @cp $(ASYM_PATH)/prime_sample/prime_sample $(BIN_INSTALLPATH); ++ @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample $(BIN_INSTALLPATH); ++ @cp $(SYM_PATH)/symdp_sample/sym_dp_sample $(BIN_INSTALLPATH); ++ @cp $(SYM_PATH)/ssl_sample/ssl_sample $(BIN_INSTALLPATH); ++ @cp $(SYM_PATH)/nrbg_sample/nrbg_sample $(BIN_INSTALLPATH); ++ @cp $(SYM_PATH)/hash_file_sample/hash_file_sample $(BIN_INSTALLPATH); ++ @cp $(SYM_PATH)/ipsec_sample/ipsec_sample $(BIN_INSTALLPATH); ++ @cp $(SYM_PATH)/hash_sample/hash_sample $(BIN_INSTALLPATH); ++ @cp $(SYM_PATH)/gcm_sample/gcm_sample $(BIN_INSTALLPATH); ++ @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample $(BIN_INSTALLPATH); ++ @cp $(SYM_PATH)/ccm_sample/ccm_sample $(BIN_INSTALLPATH); ++ @cp $(SYM_PATH)/drbg_sample/drbg_sample $(BIN_INSTALLPATH); ++ @cp $(SYM_PATH)/cipher_sample/cipher_sample $(BIN_INSTALLPATH); ++ ++ifneq ($(WITH_UPSTREAM),1) ++ @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(DC_PATH)/dc_dp_sample/dc_dp_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(DC_PATH)/stateless_sample/dc_stateless_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(ASYM_PATH)/prime_sample/prime_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/symdp_sample/sym_dp_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/ssl_sample/ssl_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/nrbg_sample/nrbg_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/ipsec_sample/ipsec_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/hash_sample/hash_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/gcm_sample/gcm_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/alg_chaining_sample/algchaining_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/ccm_sample/ccm_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/drbg_sample/drbg_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/cipher_sample/cipher_sample.ko $(MODULE_INSTALLPATH); + endif + + CLEAN_DC=clean_dc_dp_sample clean_stateless_sample \ +-- +1.9.1 + 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 @@ +From b21929c42aca4bc80f6c48b5ac31bf20165b2f3e Mon Sep 17 00:00:00 2001 +From: Rahul Kumar Gupta +Date: Fri, 25 Mar 2016 18:02:37 +0800 +Subject: [PATCH] qat: override CC LD AR only when it is not define + +Upstream-Status: Inappropriate [Configuration] + +To make sure that compiler linker and archiver will override only when +it is not defined by the environment. + +Signed-off-by: Rahul Kumar Gupta +--- + quickassist/build_system/build_files/Core/ia.mk | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/quickassist/build_system/build_files/Core/ia.mk b/quickassist/build_system/build_files/Core/ia.mk +index 4a4d123..f9aca23 100755 +--- a/quickassist/build_system/build_files/Core/ia.mk ++++ b/quickassist/build_system/build_files/Core/ia.mk +@@ -67,9 +67,9 @@ + # e.g. setenv CROSS_COMPILE x86_64-linux + ifdef CROSS_COMPILE + ifdef MACHINE +-CC = $(CROSS_COMPILE)gcc +-LD = $(CROSS_COMPILE)ld +-AR = $(CROSS_COMPILE)ar ++CC ?= $(CROSS_COMPILE)gcc ++LD ?= $(CROSS_COMPILE)ld ++AR ?= $(CROSS_COMPILE)ar + else + $(error MACHINE is undefined. Please set your target i.e. x86_64 \ + "-> setenv MACHINE x86_64 or export MACHINE=x86_64") +-- +1.9.1 + 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 @@ -include qat16.inc - -SRC_URI += "file://qat16_2.3.0-34-qat-add-install-target-to-makefiles.patch \ - file://qat16_2.3.0-34-qat-replace-strict_strtoull-with-kstrtoull.patch \ - " - -SRC_URI[qat.md5sum] = "9614bf598bc8e7eedc8adb6d29109033" -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 @@ +include qat16.inc + +SRC_URI += "https://01.org/sites/default/files/page/qatmux.l.2.6.0-60.tgz;name=qat \ + file://qat16_2.6.0-65-qat-add-install-target-to-makefiles.patch \ + file://qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch \ + " + +SRC_URI[qat.md5sum] = "c54e877fb9fbb4690a9bd50793268bcf" +SRC_URI[qat.sha256sum] = "872046ffdf02f664d12a56cdb880403d65b914b303b75875707a9eebd9c841f5" + +do_install_append() { + install -m 0755 ${SAMPLE_CODE_DIR}/performance/compression/calgary32 ${D}${base_libdir}/firmware +} -- cgit v1.2.3-54-g00ecf