From 94890cec951bbf922326162823d2664cd0056ea0 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Wed, 16 Sep 2015 10:33:37 -0700 Subject: intel-quark-common: disable padlock code The padlock code is a subset of x86 hardware acceleration code. It uses the cmov instruction which is invalid on Quark based hardware, so we disable this code. Signed-off-by: Saul Wold --- conf/machine/include/intel-quark-common.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/conf/machine/include/intel-quark-common.inc b/conf/machine/include/intel-quark-common.inc index e2d34d70..ac518bef 100644 --- a/conf/machine/include/intel-quark-common.inc +++ b/conf/machine/include/intel-quark-common.inc @@ -1,7 +1,11 @@ # -# Common configuration for all MACHINES of the intel-corei7-64 type +# Common configuration for all MACHINES of the intel-quark type # DEFAULTTUNE ?= "i586-nlp-32" require conf/machine/include/tune-i586-nlp.inc require conf/machine/include/x86-base.inc + +# gnutls padlock code uses CMOV instruction in assembly which +# is not valid for Quark. +EXTRA_OECONF_append_pn-gnutls_intel-quark = " --disable-padlock" -- cgit v1.2.3-54-g00ecf From b48760e6e3dda826160c004749ccf253f188776d Mon Sep 17 00:00:00 2001 From: Wu Zheng Date: Mon, 21 Sep 2015 17:12:04 +0800 Subject: linux-yocto_4.1: Add the 6lowpan related patch to 4.1 This SRCREV update to add the 6lowpan related patch to 4.1. The some fs related patches are merged to 4.1 too. Signed-off-by: Wu Zheng Signed-off-by: Saul Wold --- common/recipes-kernel/linux/linux-yocto_4.1.bbappend | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend index f248b31d..bb789894 100644 --- a/common/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/common/recipes-kernel/linux/linux-yocto_4.1.bbappend @@ -6,16 +6,16 @@ LINUX_VERSION_core2-32-intel-common = "4.1.6" COMPATIBLE_MACHINE_core2-32-intel-common = "${MACHINE}" KMACHINE_core2-32-intel-common = "intel-core2-32" KBRANCH_core2-32-intel-common = "standard/base" -SRCREV_meta_core2-32-intel-common ?= "429f9e2ff0649b8c9341345622545d874d5e303a" -SRCREV_machine_core2-32-intel-common ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e" +SRCREV_meta_core2-32-intel-common ?= "f674c39cffb3d05c1a8ba4a49418c39add0d57d7" +SRCREV_machine_core2-32-intel-common ?= "87df2e93ed65bf0daaeabeb5c9bcdd7b48cc2ef4" KERNEL_FEATURES_append_core2-32-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" LINUX_VERSION_corei7-64-intel-common = "4.1.6" COMPATIBLE_MACHINE_corei7-64-intel-common = "${MACHINE}" KMACHINE_corei7-64-intel-common = "intel-corei7-64" KBRANCH_corei7-64-intel-common = "standard/base" -SRCREV_meta_corei7-64-intel-common ?= "429f9e2ff0649b8c9341345622545d874d5e303a" -SRCREV_machine_corei7-64-intel-common ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e" +SRCREV_meta_corei7-64-intel-common ?= "f674c39cffb3d05c1a8ba4a49418c39add0d57d7" +SRCREV_machine_corei7-64-intel-common ?= "87df2e93ed65bf0daaeabeb5c9bcdd7b48cc2ef4" KERNEL_FEATURES_append_corei7-64-intel-common = "${KERNEL_FEATURES_INTEL_COMMON}" # Quark / X1000 BSP Info @@ -23,8 +23,8 @@ LINUX_VERSION_i586-nlp-32-intel-common = "4.1.6" COMPATIBLE_MACHINE_i586-nlp-32-intel-common = "${MACHINE}" KMACHINE_i586-nlp-32-intel-common = "intel-quark" KBRANCH_i586-nlp-32-intel-common = "standard/base" -SRCREV_meta_i586-nlp-32-intel-common ?= "429f9e2ff0649b8c9341345622545d874d5e303a" -SRCREV_machine_i586-nlp-32-intel-common ?= "59b8c4f5e8ddb9c33c62fff22204fe2b0d8c703e" +SRCREV_meta_i586-nlp-32-intel-common ?= "f674c39cffb3d05c1a8ba4a49418c39add0d57d7" +SRCREV_machine_i586-nlp-32-intel-common ?= "87df2e93ed65bf0daaeabeb5c9bcdd7b48cc2ef4" KERNEL_FEATURES_append_i586-nlp-32-intel-common = "" -- cgit v1.2.3-54-g00ecf From 10a7d933f18c3796c431436b028cca844be12180 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 18 Sep 2015 15:40:04 +0800 Subject: meta-isg: qat: move common content to qat16.inc * Move common meta-data from version specific recipe to inc. * Remove PV in the recipe. Signed-off-by: Anuj Mittal Signed-off-by: Saul Wold --- meta-isg/common/recipes-extended/qat/qat16.inc | 114 ++++++++++++++++++++ .../common/recipes-extended/qat/qat16_2.3.0-34.bb | 117 +-------------------- 2 files changed, 117 insertions(+), 114 deletions(-) create mode 100644 meta-isg/common/recipes-extended/qat/qat16.inc diff --git a/meta-isg/common/recipes-extended/qat/qat16.inc b/meta-isg/common/recipes-extended/qat/qat16.inc new file mode 100644 index 00000000..e602dbd8 --- /dev/null +++ b/meta-isg/common/recipes-extended/qat/qat16.inc @@ -0,0 +1,114 @@ +DESCRIPTION = "Intel(r) QuickAssist Technology API" +HOMEPAGE = "https://01.org/packet-processing/intel%C2%AE-quickassist-technology-drivers-and-patches" + +#Dual BSD and GPLv2 License +LICENSE = "BSD & GPLv2" +LIC_FILES_CHKSUM = "\ + file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ + file://${COMMON_LICENSE_DIR}/BSD;md5=3775480a712fc46a69647678acb234cb \ + " + +DEPENDS += "zlib openssl" +PROVIDES += "virtual/qat" + +SRC_URI="https://01.org/sites/default/files/page/qatmux.l.${PV}.tgz;name=qat \ + file://qat16_2.3.0-34-qat-fix-for-cross-compilation-issue.patch \ + file://qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch \ + " + +COMPATIBLE_MACHINE = "crystalforest" + +S = "${WORKDIR}/${ICP_DRIVER_TYPE}" +ICP_TOOLS = "accelcomp" +SAMPLE_CODE_DIR = "${S}/quickassist/lookaside/access_layer/src/sample_code" + +export ICP_DRIVER_TYPE = "QAT1.6" +export ICP_FIRMWARE_DIR="dh895xcc" +export ICP_ROOT = "${S}" +export ICP_ENV_DIR = "${S}/quickassist/build_system/build_files/env_files" +export ICP_BUILDSYSTEM_PATH = "${S}/quickassist/build_system" +export ICP_TOOLS_TARGET = "${ICP_TOOLS}" +export FUNC_PATH = "${ICP_ROOT}/quickassist/lookaside/access_layer/src/sample_code/functional" +export KERNEL_SOURCE_ROOT = "${STAGING_KERNEL_DIR}" +export ICP_BUILD_OUTPUT = "${D}" +export DEST_LIBDIR = "${libdir}" +export DEST_BINDIR = "${bindir}" +export QAT_KERNEL_VER = "${KERNEL_VERSION}" +export SAMPLE_BUILD_OUTPUT = "${D}" +export MODULE_DIR = "${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers" + +inherit module +inherit update-rc.d +INITSCRIPT_NAME = "qat_service" + +PARALLEL_MAKE = "" + +#To get around the double slashes in paths in QAT makefiles +PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" + +do_unpack2() { + cd ${S}/ + tar xzvf ${ICP_DRIVER_TYPE}.L.${PV}.tar.gz +} + +addtask unpack2 after do_unpack before do_patch + +do_compile () { + export LD="${LD} --hash-style=gnu" + export MACHINE="${TARGET_ARCH}" + cd ${S}/quickassist + oe_runmake EXTRA_OEMAKE="'CFLAGS=${CFLAGS} -fPIC'" + + cd ${SAMPLE_CODE_DIR} + touch ${SAMPLE_CODE_DIR}/performance/compression/calgary + touch ${SAMPLE_CODE_DIR}/performance/compression/canterbury + + #build the whole sample code: fips, functional, performance + oe_runmake 'all' + oe_runmake 'fips_user_code' +} + +do_install() { + cd ${S}/quickassist + oe_runmake install + + cd ${SAMPLE_CODE_DIR} + oe_runmake install + + install -d ${D}/etc/udev/rules.d \ + ${D}${includedir} \ + ${D}${includedir}/dc \ + ${D}${includedir}/lac \ + ${D}${sysconfdir}/dh895xcc \ + ${D}${base_libdir}/firmware + + echo 'KERNEL=="icp_adf_ctl" MODE="0600"' > ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules + echo 'KERNEL=="icp_dev[0-9]*" MODE="0600"' >> ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules + echo 'KERNEL=="icp_dev_mem?" MODE="0600"' >> ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules + + install -m 640 ${S}/quickassist/include/*.h ${D}${includedir} + install -m 640 ${S}/quickassist/include/dc/*.h ${D}${includedir}/dc/ + install -m 640 ${S}/quickassist/include/lac/*.h ${D}${includedir}/lac/ + install -m 640 ${S}/quickassist/lookaside/access_layer/include/*.h ${D}${includedir} + + install -m 0755 ${SAMPLE_CODE_DIR}/performance/compression/calgary ${D}${base_libdir}/firmware + install -m 0755 ${SAMPLE_CODE_DIR}/performance/compression/canterbury ${D}${base_libdir}/firmware + + install -m 660 ${S}/quickassist/config/dh* ${D}${sysconfdir}/dh895xcc +} + +PACKAGES += "${PN}-app" + +FILES_${PN}-dev = "${includedir}" + +FILES_${PN} += "\ + ${base_libdir}/firmware/ \ + ${sysconfdir}/ \ + ${sysconfdir}/udev/rules.d/ \ + ${sysconfdir}/init.d/ \ + ${libdir}/ \ + " + +FILES_${PN}-dbg += "${sysconfdir}/init.d/.debug" + +FILES_${PN}-app += "${bindir}/*" diff --git a/meta-isg/common/recipes-extended/qat/qat16_2.3.0-34.bb b/meta-isg/common/recipes-extended/qat/qat16_2.3.0-34.bb index 83ccbfb1..293323dd 100644 --- a/meta-isg/common/recipes-extended/qat/qat16_2.3.0-34.bb +++ b/meta-isg/common/recipes-extended/qat/qat16_2.3.0-34.bb @@ -1,118 +1,7 @@ -DESCRIPTION = "Intel(r) QuickAssist Technology API" -HOMEPAGE = "https://01.org/packet-processing/intel%C2%AE-quickassist-technology-drivers-and-patches" +include qat16.inc -#Dual BSD and GPLv2 License -LICENSE = "BSD & GPLv2" -LIC_FILES_CHKSUM = "\ - file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \ - file://${COMMON_LICENSE_DIR}/BSD;md5=3775480a712fc46a69647678acb234cb \ - " -PV = "2.3.0-34" -DEPENDS += "zlib openssl" -PROVIDES += "virtual/qat" - -SRC_URI="https://01.org/sites/default/files/page/qatmux.l.${PV}.tgz;name=qat \ - file://qat16_2.3.0-34-qat-add-install-target-to-makefiles.patch \ - file://qat16_2.3.0-34-qat-fix-for-cross-compilation-issue.patch \ - file://qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch \ - " +SRC_URI += "file://qat16_2.3.0-34-qat-add-install-target-to-makefiles.patch \ + " SRC_URI[qat.md5sum] = "9614bf598bc8e7eedc8adb6d29109033" SRC_URI[qat.sha256sum] = "1f9708de3c132258eaa488c82760f374b6b6838c85cafef2e8c61034fe0f7031" - -COMPATIBLE_MACHINE = "crystalforest" - -S = "${WORKDIR}/${ICP_DRIVER_TYPE}" -ICP_TOOLS = "accelcomp" -SAMPLE_CODE_DIR = "${S}/quickassist/lookaside/access_layer/src/sample_code" - -export ICP_DRIVER_TYPE = "QAT1.6" -export ICP_FIRMWARE_DIR="dh895xcc" -export ICP_ROOT = "${S}" -export ICP_ENV_DIR = "${S}/quickassist/build_system/build_files/env_files" -export ICP_BUILDSYSTEM_PATH = "${S}/quickassist/build_system" -export ICP_TOOLS_TARGET = "${ICP_TOOLS}" -export FUNC_PATH = "${ICP_ROOT}/quickassist/lookaside/access_layer/src/sample_code/functional" -export KERNEL_SOURCE_ROOT = "${STAGING_KERNEL_DIR}" -export ICP_BUILD_OUTPUT = "${D}" -export DEST_LIBDIR = "${libdir}" -export DEST_BINDIR = "${bindir}" -export QAT_KERNEL_VER = "${KERNEL_VERSION}" -export SAMPLE_BUILD_OUTPUT = "${D}" -export MODULE_DIR = "${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers" - -inherit module -inherit update-rc.d -INITSCRIPT_NAME = "qat_service" - -PARALLEL_MAKE = "" - -#To get around the double slashes in paths in QAT makefiles -PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" - -do_unpack2() { - cd ${S}/ - tar xzvf ${ICP_DRIVER_TYPE}.L.${PV}.tar.gz -} - -addtask unpack2 after do_unpack before do_patch - -do_compile () { - export LD="${LD} --hash-style=gnu" - export MACHINE="${TARGET_ARCH}" - cd ${S}/quickassist - oe_runmake EXTRA_OEMAKE="'CFLAGS=${CFLAGS} -fPIC'" - - cd ${SAMPLE_CODE_DIR} - touch ${SAMPLE_CODE_DIR}/performance/compression/calgary - touch ${SAMPLE_CODE_DIR}/performance/compression/canterbury - - #build the whole sample code: fips, functional, performance - oe_runmake 'all' - oe_runmake 'fips_user_code' -} - -do_install() { - cd ${S}/quickassist - oe_runmake install - - cd ${SAMPLE_CODE_DIR} - oe_runmake install - - install -d ${D}/etc/udev/rules.d \ - ${D}${includedir} \ - ${D}${includedir}/dc \ - ${D}${includedir}/lac \ - ${D}${sysconfdir}/dh895xcc \ - ${D}${base_libdir}/firmware - - echo 'KERNEL=="icp_adf_ctl" MODE="0600"' > ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules - echo 'KERNEL=="icp_dev[0-9]*" MODE="0600"' >> ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules - echo 'KERNEL=="icp_dev_mem?" MODE="0600"' >> ${D}/etc/udev/rules.d/00-dh895xcc_qa.rules - - install -m 640 ${S}/quickassist/include/*.h ${D}${includedir} - install -m 640 ${S}/quickassist/include/dc/*.h ${D}${includedir}/dc/ - install -m 640 ${S}/quickassist/include/lac/*.h ${D}${includedir}/lac/ - install -m 640 ${S}/quickassist/lookaside/access_layer/include/*.h ${D}${includedir} - - install -m 0755 ${SAMPLE_CODE_DIR}/performance/compression/calgary ${D}${base_libdir}/firmware - install -m 0755 ${SAMPLE_CODE_DIR}/performance/compression/canterbury ${D}${base_libdir}/firmware - - install -m 660 ${S}/quickassist/config/dh* ${D}${sysconfdir}/dh895xcc -} - -PACKAGES += "${PN}-app" - -FILES_${PN}-dev = "${includedir}" - -FILES_${PN} += "\ - ${base_libdir}/firmware/ \ - ${sysconfdir}/ \ - ${sysconfdir}/udev/rules.d/ \ - ${sysconfdir}/init.d/ \ - ${libdir}/ \ - " - -FILES_${PN}-dbg += "${sysconfdir}/init.d/.debug" - -FILES_${PN}-app += "${bindir}/*" -- cgit v1.2.3-54-g00ecf From 1201a576c9bcdab3bfcf87efeb2184f0025ae53e Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 18 Sep 2015 15:40:05 +0800 Subject: meta-isg: qat: fix inline build errors for gcc5 gcc5 has changed its default standard to gnu11 from gnu89. These two standards have different inline semantics. This results in errors like: undefined reference to `icp_adf_getQueueNext' undefined reference to `icp_adf_updateQueueTail' undefined reference to `icp_adf_pollQueue' undefined reference to `icp_adf_queueDataToSend' undefined reference to `icp_adf_getQueueMemory' Use the -fgnu89-inline command line option as suggested in [1]. Also, make sure that all the CFLAGS values are being picked up by the compiler. [1] https://gcc.gnu.org/gcc-5/porting_to.html Signed-off-by: Anuj Mittal Signed-off-by: Saul Wold --- meta-isg/common/recipes-extended/qat/qat16.inc | 3 +++ ...t16_2.3.0-34-make-sure-CFLAGS-are-correct.patch | 30 ++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch diff --git a/meta-isg/common/recipes-extended/qat/qat16.inc b/meta-isg/common/recipes-extended/qat/qat16.inc index e602dbd8..822db5d8 100644 --- a/meta-isg/common/recipes-extended/qat/qat16.inc +++ b/meta-isg/common/recipes-extended/qat/qat16.inc @@ -14,6 +14,7 @@ PROVIDES += "virtual/qat" SRC_URI="https://01.org/sites/default/files/page/qatmux.l.${PV}.tgz;name=qat \ file://qat16_2.3.0-34-qat-fix-for-cross-compilation-issue.patch \ file://qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch \ + file://qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch \ " COMPATIBLE_MACHINE = "crystalforest" @@ -46,6 +47,8 @@ PARALLEL_MAKE = "" #To get around the double slashes in paths in QAT makefiles PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" +EXTRA_OEMAKE_append = " CFLAGS+=-fgnu89-inline" + do_unpack2() { cd ${S}/ tar xzvf ${ICP_DRIVER_TYPE}.L.${PV}.tar.gz diff --git a/meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch b/meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch new file mode 100644 index 00000000..e1ed3fc9 --- /dev/null +++ b/meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch @@ -0,0 +1,30 @@ +From 83f465ee776868875f6c19c2110eed4db6c547ce Mon Sep 17 00:00:00 2001 +From: Anuj Mittal +Date: Thu, 10 Sep 2015 11:58:44 +0800 +Subject: [PATCH] qat: make sure CFLAGS are correct + +Upstream-Status: Submitted + +Ensure that all the CFLAGS values are being considered. + +Signed-off-by: Anuj Mittal +--- + quickassist/adf/user/user_proxy/src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/quickassist/adf/user/user_proxy/src/Makefile b/quickassist/adf/user/user_proxy/src/Makefile +index 868313a..efd352c 100644 +--- a/quickassist/adf/user/user_proxy/src/Makefile ++++ b/quickassist/adf/user/user_proxy/src/Makefile +@@ -133,7 +133,7 @@ INCLUDES+= -I$(ADF_DIR)/include \ + -I$(ADF_PLATFORM_DIR)/include \ + -I$(ADF_CTL_DIR)/include + +-CFLAGS = -D_GNU_SOURCE -O2 $(INCLUDES) ++CFLAGS += -D_GNU_SOURCE -O2 $(INCLUDES) + #needed by SAL + EXTRA_CFLAGS += -fPIC -fno-strict-aliasing + #include your $(ICP_OS)_$(ICP_OS_LEVEL).mk file +-- +1.7.9.5 + -- cgit v1.2.3-54-g00ecf From 88a5f5857d56e4a8952a7cd7d215178a78161871 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 18 Sep 2015 15:40:06 +0800 Subject: meta-isg: qat: fix strict_str* compile errors Defines strict_str* have become obsolete and removed entirely starting from kernel v3.18. This results in errors like: error: implicit declaration of function 'strict_strtoull' [-Werror=implicit-function-declaration] Replace strict_strtoull with kstrtoull to ensure qat 2.3.0-34 compiles. Signed-off-by: Anuj Mittal Signed-off-by: Saul Wold --- ...at-replace-strict_strtoull-with-kstrtoull.patch | 40 ++++++++++++++++++++++ .../common/recipes-extended/qat/qat16_2.3.0-34.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-replace-strict_strtoull-with-kstrtoull.patch diff --git a/meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-replace-strict_strtoull-with-kstrtoull.patch b/meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-replace-strict_strtoull-with-kstrtoull.patch new file mode 100644 index 00000000..dee1f71a --- /dev/null +++ b/meta-isg/common/recipes-extended/qat/qat16/qat16_2.3.0-34-qat-replace-strict_strtoull-with-kstrtoull.patch @@ -0,0 +1,40 @@ +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_2.3.0-34.bb b/meta-isg/common/recipes-extended/qat/qat16_2.3.0-34.bb index 293323dd..d6e9af40 100644 --- a/meta-isg/common/recipes-extended/qat/qat16_2.3.0-34.bb +++ b/meta-isg/common/recipes-extended/qat/qat16_2.3.0-34.bb @@ -1,6 +1,7 @@ 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" -- cgit v1.2.3-54-g00ecf From d8d152e668990dbb0dab77a44a4b73660388cc06 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 18 Sep 2015 15:40:07 +0800 Subject: meta-isg: qat: recipe for version 2.5.0-80 This adds the recipe for qat16 v2.5.0-80 for grantley platforms using the common BSP intel-corei7-64. Signed-off-by: Anuj Mittal Signed-off-by: Saul Wold --- ....0-80-qat-add-install-target-to-makefiles.patch | 387 +++++++++++++++++++++ .../common/recipes-extended/qat/qat16_2.5.0-80.bb | 11 + 2 files changed, 398 insertions(+) create mode 100644 meta-isg/common/recipes-extended/qat/qat16/qat16_2.5.0-80-qat-add-install-target-to-makefiles.patch create mode 100644 meta-isg/common/recipes-extended/qat/qat16_2.5.0-80.bb diff --git a/meta-isg/common/recipes-extended/qat/qat16/qat16_2.5.0-80-qat-add-install-target-to-makefiles.patch b/meta-isg/common/recipes-extended/qat/qat16/qat16_2.5.0-80-qat-add-install-target-to-makefiles.patch new file mode 100644 index 00000000..927389ff --- /dev/null +++ b/meta-isg/common/recipes-extended/qat/qat16/qat16_2.5.0-80-qat-add-install-target-to-makefiles.patch @@ -0,0 +1,387 @@ +From 803fd66d6a7e6dccc420f925106da0f05766a2f6 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal +Date: Wed, 9 Sep 2015 16:58:55 +0800 +Subject: [PATCH] qat: add-install-target-to-makefiles + +Upstream-Status: Inappropriate [Configuration] + +Add install target to makefile to help install +ingredients at the proper location. + +Signed-off-by: Anuj Mittal +--- + quickassist/Makefile | 36 ++++++---- + .../access_layer/src/sample_code/Makefile | 18 +++-- + .../src/sample_code/functional/Makefile | 73 +++++++++++--------- + 3 files changed, 73 insertions(+), 54 deletions(-) + +diff --git a/quickassist/Makefile b/quickassist/Makefile +index 339d410..b23a409 100644 +--- a/quickassist/Makefile ++++ b/quickassist/Makefile +@@ -108,7 +108,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` + +@@ -120,7 +120,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'; +@@ -128,10 +137,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)/; + +@@ -150,7 +159,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'; +@@ -175,7 +183,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'; +@@ -185,13 +192,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'; +@@ -199,20 +203,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' +@@ -248,6 +250,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 e13bbf0..fbc575e 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); \ +@@ -162,17 +165,13 @@ endif + 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_kernel: output_dir + @echo ; echo "Building common_mem_drv kernel space"; +@@ -187,12 +186,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 3625637..322622b 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,31 +122,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 \ +@@ -159,86 +154,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 +@@ -248,18 +222,51 @@ 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)/dc_dp_sample/dc_dp_sample $(BIN_INSTALLPATH); ++ @cp $(DC_PATH)/stateless_sample/dc_stateless_sample $(BIN_INSTALLPATH); ++ @cp $(DC_PATH)/stateful_sample/dc_stateful_sample $(BIN_INSTALLPATH); ++ @cp $(DC_PATH)/stateful_sample/paper4 $(BIN_INSTALLPATH); ++ @cp $(DC_PATH)/stateless_multi_op_checksum_sample/dc_stateless_multi_op_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)/cipher_sample/cipher_sample $(BIN_INSTALLPATH); ++ @cp $(SYM_PATH)/drbg_sample/drbg_sample $(BIN_INSTALLPATH); ++ @cp $(SYM_PATH)/gcm_sample/gcm_sample $(BIN_INSTALLPATH); ++ @cp $(SYM_PATH)/hash_file_sample/hash_file_sample $(BIN_INSTALLPATH); ++ @cp $(SYM_PATH)/hash_sample/hash_sample $(BIN_INSTALLPATH); ++ @cp $(SYM_PATH)/ipsec_sample/ipsec_sample $(BIN_INSTALLPATH); ++ @cp $(SYM_PATH)/nrbg_sample/nrbg_sample $(BIN_INSTALLPATH); ++ @cp $(SYM_PATH)/ssl_sample/ssl_sample $(BIN_INSTALLPATH); ++ @cp $(SYM_PATH)/symdp_sample/sym_dp_sample $(BIN_INSTALLPATH); ++ @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample $(BIN_INSTALLPATH); ++ @cp $(ASYM_PATH)/prime_sample/prime_sample $(BIN_INSTALLPATH); ++ifneq ($(WITH_UPSTREAM),1) ++ @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_multi_op_checksum_sample/dc_stateless_multi_op_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)/cipher_sample/cipher_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/drbg_sample/drbg_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/gcm_sample/gcm_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/hash_sample/hash_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/ipsec_sample/ipsec_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/nrbg_sample/nrbg_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/ssl_sample/ssl_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(SYM_PATH)/symdp_sample/sym_dp_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(ASYM_PATH)/diffie_hellman_sample/dh_sample.ko $(MODULE_INSTALLPATH); ++ @cp $(ASYM_PATH)/prime_sample/prime_sample.ko $(MODULE_INSTALLPATH); + endif + + CLEAN_DC=clean_dc_dp_sample clean_stateless_sample \ +-- +1.7.9.5 + diff --git a/meta-isg/common/recipes-extended/qat/qat16_2.5.0-80.bb b/meta-isg/common/recipes-extended/qat/qat16_2.5.0-80.bb new file mode 100644 index 00000000..d9cd666d --- /dev/null +++ b/meta-isg/common/recipes-extended/qat/qat16_2.5.0-80.bb @@ -0,0 +1,11 @@ +include qat16.inc + +SRC_URI += "file://qat16_2.5.0-80-qat-add-install-target-to-makefiles.patch \ + " + +SRC_URI[qat.md5sum] = "e3c2ceeec7ed8b36d75682742caff81e" +SRC_URI[qat.sha256sum] = "e9e47cd9cbd98c2ceac5cc31570e443680649be682068126df6d749120a3697d" + +do_install_append() { + install -m 0755 ${SAMPLE_CODE_DIR}/performance/compression/calgary32 ${D}${base_libdir}/firmware +} -- cgit v1.2.3-54-g00ecf From 710f48ddeb44e08eb76d1ca0913338a5e21b56e8 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 18 Sep 2015 15:40:08 +0800 Subject: meta-isg: qat: add intel-corei7-64 COMPATIBLE_MACHINE Mark intel common BSP as the compatible machine for qat recipes. Signed-off-by: Anuj Mittal Signed-off-by: Saul Wold --- meta-isg/common/recipes-extended/qat/qat16.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-isg/common/recipes-extended/qat/qat16.inc b/meta-isg/common/recipes-extended/qat/qat16.inc index 822db5d8..90765ea0 100644 --- a/meta-isg/common/recipes-extended/qat/qat16.inc +++ b/meta-isg/common/recipes-extended/qat/qat16.inc @@ -17,7 +17,7 @@ SRC_URI="https://01.org/sites/default/files/page/qatmux.l.${PV}.tgz;name=qat \ file://qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch \ " -COMPATIBLE_MACHINE = "crystalforest" +COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64" S = "${WORKDIR}/${ICP_DRIVER_TYPE}" ICP_TOOLS = "accelcomp" -- cgit v1.2.3-54-g00ecf From bd1e3db669dfdd6b3bcb51ee8b05601adb9cf277 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 18 Sep 2015 15:40:09 +0800 Subject: meta-isg: zlib-qat: add COMPATIBLE_MACHINE Mark common intel-core-i7 as the COMPATIBLE_MACHINE for zlib-qat recipe. Signed-off-by: Anuj Mittal Signed-off-by: Saul Wold --- meta-isg/common/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-isg/common/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb b/meta-isg/common/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb index b3dc19cb..83f28966 100644 --- a/meta-isg/common/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb +++ b/meta-isg/common/recipes-extended/zlib-qat/zlib-qat_0.4.7-002.bb @@ -29,7 +29,7 @@ SRC_URI[zlib.sha256sum] = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166 SRC_URI[zlibqat.md5sum] = "dfde8618198aa8d35ecc00d10dcc7000" SRC_URI[zlibqat.sha256sum] = "8e5786400bbc2a879ae705c864ec63b53ae019b4f2d1c94524a97223847b6e46" -COMPATIBLE_MACHINE = "crystalforest" +COMPATIBLE_MACHINE = "crystalforest|intel-corei7-64" ZLIB_VERSION = "1.2.8" ZLIB_QAT_VERSION = "0.4.7-002" -- cgit v1.2.3-54-g00ecf