From: Chee Yang Lee <[email protected]> Also refactor recipe, move common metadata to .inc .
add new copy of these patch with fuzz fixed for qat20. - 0004-update-KDIR-for-cross-compilation.patch - 0006-qat-add-install-target-and-add-folder.patch Signed-off-by: Chee Yang Lee <[email protected]> --- recipes-extended/qat/qat.inc | 161 ++++++++++++++++++ recipes-extended/qat/qat17_4.20.0-00001.bb | 160 +---------------- ...at20-remove-local-path-from-makefile.patch | 31 ++++ ...s-adf_ctl-Allow-CXX-to-be-overridden.patch | 28 +++ ...20-update-KDIR-for-cross-compilation.patch | 37 ++++ ...at-add-install-target-and-add-folder.patch | 68 ++++++++ recipes-extended/qat/qat20_1.0.0-00021.bb | 22 +++ 7 files changed, 349 insertions(+), 158 deletions(-) create mode 100644 recipes-extended/qat/qat.inc create mode 100644 recipes-extended/qat/qat20/0001-qat20-remove-local-path-from-makefile.patch create mode 100644 recipes-extended/qat/qat20/0001-utilities-adf_ctl-Allow-CXX-to-be-overridden.patch create mode 100644 recipes-extended/qat/qat20/0004-qat20-update-KDIR-for-cross-compilation.patch create mode 100644 recipes-extended/qat/qat20/0006-qat20-qat-add-install-target-and-add-folder.patch create mode 100644 recipes-extended/qat/qat20_1.0.0-00021.bb diff --git a/recipes-extended/qat/qat.inc b/recipes-extended/qat/qat.inc new file mode 100644 index 0000000..04cc4d1 --- /dev/null +++ b/recipes-extended/qat/qat.inc @@ -0,0 +1,161 @@ +DESCRIPTION = "Intel(r) QuickAssist Technology API" +HOMEPAGE = "https://www.intel.com/content/www/us/en/developer/topic-technology/open/quick-assist-technology/overview.html"; + +#Dual BSD and GPLv2 License +LICENSE = "BSD-3-Clause & GPL-2.0-only" +LIC_FILES_CHKSUM = "\ + file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \ + file://LICENSE.BSD;md5=4a6a5cd99f6064d61adad8c6c0bd080f \ + " +DEPENDS += "boost udev zlib openssl yasm-native" +PROVIDES += "virtual/qat" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_configure[depends] += "virtual/kernel:do_shared_workdir" + +COMPATIBLE_MACHINE = "null" +COMPATIBLE_HOST:x86-x32 = 'null' +COMPATIBLE_HOST:libc-musl:class-target = 'null' + +ICP_TOOLS = "accelcomp" +SAMPLE_CODE_DIR = "${S}/quickassist/lookaside/access_layer/src/sample_code" +QAT_HEADER_FILES = "/opt/intel/QAT/quickassist" +HUGE_PAGE_DIR = "/dev/hugepages/qat" + +export INSTALL_MOD_PATH = "${D}" +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 INSTALL_FW_PATH = "${D}${base_libdir}/firmware" +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 INSTALL_MOD_DIR = "${D}${base_libdir}/modules/${KERNEL_VERSION}" +export KERNEL_BUILDDIR = "${STAGING_KERNEL_BUILDDIR}" +export SC_EPOLL_DISABLED = "1" +export WITH_UPSTREAM = "1" +export WITH_CMDRV = "1" +export KERNEL_SOURCE_DIR = "${ICP_ROOT}/quickassist/qat/" +export ICP_NO_CLEAN = "1" +export ICP_QDM_IOMMU = "1" + +inherit module +inherit update-rc.d +INITSCRIPT_NAME = "qat_service" + +PARALLEL_MAKE = "" + +EXTRA_OEMAKE:append = " CFLAGS+='-fgnu89-inline -fPIC'" +EXTRA_OEMAKE = "-e MAKEFLAGS=" + +do_compile () { + export LD="${LD} --hash-style=gnu" + export MACHINE="${TARGET_ARCH}" + + cd ${S}/quickassist/qat + oe_runmake + oe_runmake 'modules_install' + + cd ${S}/quickassist + oe_runmake + + cd ${S}/quickassist/utilities/adf_ctl + oe_runmake + + cd ${S}/quickassist/utilities/libusdm_drv + oe_runmake + + cd ${S}/quickassist/lookaside/access_layer/src/qat_direct/src/ + oe_runmake + + #build the whole sample code: per_user only + cd ${SAMPLE_CODE_DIR} + oe_runmake 'perf_user' +} + +do_install() { + export MACHINE="${TARGET_ARCH}" + + cd ${S}/quickassist + oe_runmake install + + cd ${S}/quickassist/qat + oe_runmake modules_install + + install -d ${D}${sysconfdir}/udev/rules.d + install -d ${D}${sbindir} + install -d ${D}${sysconfdir}/conf_files + install -d ${D}${prefix}/src/qat + + echo 'KERNEL=="qat_adf_ctl" MODE="0660" GROUP="qat"' > ${D}/etc/udev/rules.d/00-qat.rules + echo 'KERNEL=="qat_dev_processes" MODE="0660" GROUP="qat"' >> ${D}/etc/udev/rules.d/00-qat.rules + echo 'KERNEL=="usdm_drv" MODE="0660" GROUP="qat"' >> ${D}/etc/udev/rules.d/00-qat.rules + echo 'KERNEL=="uio*" MODE="0660" GROUP="qat"' >> ${D}/etc/udev/rules.d/00-qat.rules + echo 'ACTION=="add", DEVPATH=="/module/usdm_drv" SUBSYSTEM=="module" RUN+="/bin/mkdir ${HUGE_PAGE_DIR}"' >> ${D}/etc/udev/rules.d/00-qat.rules + echo 'ACTION=="add", DEVPATH=="/module/usdm_drv" SUBSYSTEM=="module" RUN+="/bin/chgrp qat ${HUGE_PAGE_DIR}"' >> ${D}/etc/udev/rules.d/00-qat.rules + echo 'ACTION=="add", DEVPATH=="/module/usdm_drv" SUBSYSTEM=="module" RUN+="/bin/chmod 0770 ${HUGE_PAGE_DIR}"' >> ${D}/etc/udev/rules.d/00-qat.rules + echo 'ACTION=="remove", DEVPATH=="/module/usdm_drv" SUBSYSTEM=="module" RUN+="/bin/rmdir ${HUGE_PAGE_DIR}"' >> ${D}/etc/udev/rules.d/00-qat.rules + + mkdir -p ${D}${base_libdir} + + install -D -m 0755 ${S}/quickassist/lookaside/access_layer/src/build/linux_2.6/user_space/libqat_s.so ${D}${base_libdir} + install -D -m 0755 ${S}/quickassist/lookaside/access_layer/src/build/linux_2.6/user_space/libqat.a ${D}${base_libdir} + install -D -m 0755 ${S}/quickassist/utilities/osal/src/build/linux_2.6/user_space/libosal_s.so ${D}${base_libdir} + install -D -m 0755 ${S}/quickassist/utilities/osal/src/build/linux_2.6/user_space/libosal.a ${D}${base_libdir} + install -D -m 0755 ${S}/quickassist/utilities/libusdm_drv/libusdm_drv_s.so ${D}${base_libdir} + install -D -m 0755 ${S}/quickassist/utilities/libusdm_drv/libusdm_drv.a ${D}${base_libdir} + install -D -m 0750 ${S}/quickassist/utilities/adf_ctl/adf_ctl ${D}${sbindir} + + install -D -m 640 ${S}/quickassist/utilities/adf_ctl/conf_files/*.conf ${D}${sysconfdir}/conf_files + install -D -m 640 ${S}/quickassist/utilities/adf_ctl/conf_files/*.conf.vm ${D}${sysconfdir}/conf_files + + install -d ${D}${QAT_HEADER_FILES}/include + install -d ${D}${QAT_HEADER_FILES}/include/dc + install -d ${D}${QAT_HEADER_FILES}/include/lac + install -d ${D}${QAT_HEADER_FILES}/lookaside/access_layer/include + install -d ${D}${QAT_HEADER_FILES}/utilities/libusdm_drv + + install -m 640 ${S}/quickassist/include/*.h ${D}${QAT_HEADER_FILES}/include + install -m 640 ${S}/quickassist/include/dc/*.h ${D}${QAT_HEADER_FILES}/include/dc + install -m 640 ${S}/quickassist/include/lac/*.h ${D}${QAT_HEADER_FILES}/include/lac + install -m 640 ${S}/quickassist/lookaside/access_layer/include/*.h ${D}${QAT_HEADER_FILES}/lookaside/access_layer/include + install -m 640 ${S}/quickassist/utilities/libusdm_drv/*.h ${D}${QAT_HEADER_FILES}/utilities/libusdm_drv + + install -m 0755 ${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/calgary ${D}${nonarch_base_libdir}/firmware + install -m 0755 ${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/calgary32 ${D}${nonarch_base_libdir}/firmware + install -m 0755 ${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/canterbury ${D}${nonarch_base_libdir}/firmware +} + +SYSROOT_DIRS += "/opt" + +PACKAGES += "${PN}-app" + +FILES:${PN}-dev = "${QAT_HEADER_FILES}/ \ + ${nonarch_base_libdir}/*.a \ + " + +FILES:${PN} += "\ + ${libdir}/ \ + ${nonarch_base_libdir}/firmware \ + ${sysconfdir}/ \ + ${sbindir}/ \ + ${base_libdir}/*.so \ + ${prefix}/src/qat \ + " + +FILES:${PN}-dbg += "${sysconfdir}/init.d/.debug/ \ + " + +FILES:${PN}-app += "${bindir}/* \ + ${prefix}/qat \ + " + +# yasm encodes path to the input file and doesn't provide any option to workaround it. +INSANE_SKIP:${PN}-staticdev += "buildpaths" +INSANE_SKIP:${PN}-dbg += "buildpaths" diff --git a/recipes-extended/qat/qat17_4.20.0-00001.bb b/recipes-extended/qat/qat17_4.20.0-00001.bb index 3126657..0ddb3a8 100644 --- a/recipes-extended/qat/qat17_4.20.0-00001.bb +++ b/recipes-extended/qat/qat17_4.20.0-00001.bb @@ -1,16 +1,4 @@ -DESCRIPTION = "Intel(r) QuickAssist Technology API" -HOMEPAGE = "https://www.intel.com/content/www/us/en/developer/topic-technology/open/quick-assist-technology/overview.html"; - -#Dual BSD and GPLv2 License -LICENSE = "BSD-3-Clause & GPL-2.0-only" -LIC_FILES_CHKSUM = "\ - file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \ - file://LICENSE.BSD;md5=4a6a5cd99f6064d61adad8c6c0bd080f \ - " -DEPENDS += "boost udev zlib openssl yasm-native" -PROVIDES += "virtual/qat" - -TARGET_CC_ARCH += "${LDFLAGS}" +require qat.inc SRC_URI = "https://downloadmirror.intel.com/761891/QAT.L.4.20.0-00001.tar.gz;subdir=qat17 \ file://0001-qat-fix-for-cross-compilation-issue.patch \ @@ -23,160 +11,16 @@ SRC_URI = "https://downloadmirror.intel.com/761891/QAT.L.4.20.0-00001.tar.gz;sub file://qat-remove-the-deprecated-pci-dma-compat.h-API.patch \ " -do_configure[depends] += "virtual/kernel:do_shared_workdir" - SRC_URI[sha256sum] = "90ca71c551cbb963b261f528616f2be5085f23a87578f2325623cfb6511a32f7" -COMPATIBLE_MACHINE = "null" -COMPATIBLE_HOST:x86-x32 = 'null' -COMPATIBLE_HOST:libc-musl:class-target = 'null' - S = "${WORKDIR}/qat17" -ICP_TOOLS = "accelcomp" -SAMPLE_CODE_DIR = "${S}/quickassist/lookaside/access_layer/src/sample_code" -QAT_HEADER_FILES = "/opt/intel/QAT/quickassist" -HUGE_PAGE_DIR = "/dev/hugepages/qat" - -export INSTALL_MOD_PATH = "${D}" -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 INSTALL_FW_PATH = "${D}${base_libdir}/firmware" -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 INSTALL_MOD_DIR = "${D}${base_libdir}/modules/${KERNEL_VERSION}" -export KERNEL_BUILDDIR = "${STAGING_KERNEL_BUILDDIR}" -export SC_EPOLL_DISABLED = "1" -export WITH_UPSTREAM = "1" -export WITH_CMDRV = "1" -export KERNEL_SOURCE_DIR = "${ICP_ROOT}/quickassist/qat/" -export ICP_NO_CLEAN = "1" -export ICP_QDM_IOMMU = "1" - -inherit module -inherit update-rc.d -INITSCRIPT_NAME = "qat_service" - -PARALLEL_MAKE = "" - -EXTRA_OEMAKE:append = " CFLAGS+='-fgnu89-inline -fPIC'" -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -do_compile () { - export LD="${LD} --hash-style=gnu" - export MACHINE="${TARGET_ARCH}" - - cd ${S}/quickassist/qat - oe_runmake - oe_runmake 'modules_install' - - cd ${S}/quickassist - oe_runmake - - cd ${S}/quickassist/utilities/adf_ctl - oe_runmake - - cd ${S}/quickassist/utilities/libusdm_drv - oe_runmake - - cd ${S}/quickassist/lookaside/access_layer/src/qat_direct/src/ - oe_runmake - - #build the whole sample code: per_user only - cd ${SAMPLE_CODE_DIR} - oe_runmake 'perf_user' -} - -do_install() { - export MACHINE="${TARGET_ARCH}" - cd ${S}/quickassist - oe_runmake install - - cd ${S}/quickassist/qat - oe_runmake modules_install - - install -d ${D}${sysconfdir}/udev/rules.d - install -d ${D}${sbindir} - install -d ${D}${sysconfdir}/conf_files - install -d ${D}${prefix}/src/qat - - echo 'KERNEL=="qat_adf_ctl" MODE="0660" GROUP="qat"' > ${D}/etc/udev/rules.d/00-qat.rules - echo 'KERNEL=="qat_dev_processes" MODE="0660" GROUP="qat"' >> ${D}/etc/udev/rules.d/00-qat.rules - echo 'KERNEL=="usdm_drv" MODE="0660" GROUP="qat"' >> ${D}/etc/udev/rules.d/00-qat.rules - echo 'KERNEL=="uio*" MODE="0660" GROUP="qat"' >> ${D}/etc/udev/rules.d/00-qat.rules - echo 'ACTION=="add", DEVPATH=="/module/usdm_drv" SUBSYSTEM=="module" RUN+="/bin/mkdir ${HUGE_PAGE_DIR}"' >> ${D}/etc/udev/rules.d/00-qat.rules - echo 'ACTION=="add", DEVPATH=="/module/usdm_drv" SUBSYSTEM=="module" RUN+="/bin/chgrp qat ${HUGE_PAGE_DIR}"' >> ${D}/etc/udev/rules.d/00-qat.rules - echo 'ACTION=="add", DEVPATH=="/module/usdm_drv" SUBSYSTEM=="module" RUN+="/bin/chmod 0770 ${HUGE_PAGE_DIR}"' >> ${D}/etc/udev/rules.d/00-qat.rules - echo 'ACTION=="remove", DEVPATH=="/module/usdm_drv" SUBSYSTEM=="module" RUN+="/bin/rmdir ${HUGE_PAGE_DIR}"' >> ${D}/etc/udev/rules.d/00-qat.rules - - mkdir -p ${D}${base_libdir} - - install -D -m 0755 ${S}/quickassist/lookaside/access_layer/src/build/linux_2.6/user_space/libqat_s.so ${D}${base_libdir} - install -D -m 0755 ${S}/quickassist/lookaside/access_layer/src/build/linux_2.6/user_space/libqat.a ${D}${base_libdir} - install -D -m 0755 ${S}/quickassist/utilities/osal/src/build/linux_2.6/user_space/libosal_s.so ${D}${base_libdir} - install -D -m 0755 ${S}/quickassist/utilities/osal/src/build/linux_2.6/user_space/libosal.a ${D}${base_libdir} +do_install:append() { install -D -m 0755 ${S}/quickassist/lookaside/access_layer/src/qat_direct/src/build/linux_2.6/user_space/libadf_user.a ${D}${base_libdir}/libadf.a - install -D -m 0755 ${S}/quickassist/utilities/libusdm_drv/libusdm_drv_s.so ${D}${base_libdir} - install -D -m 0755 ${S}/quickassist/utilities/libusdm_drv/libusdm_drv.a ${D}${base_libdir} - install -D -m 0750 ${S}/quickassist/utilities/adf_ctl/adf_ctl ${D}${sbindir} - - install -D -m 640 ${S}/quickassist/utilities/adf_ctl/conf_files/*.conf ${D}${sysconfdir}/conf_files - install -D -m 640 ${S}/quickassist/utilities/adf_ctl/conf_files/*.conf.vm ${D}${sysconfdir}/conf_files install -m 0755 ${S}/quickassist/qat/fw/qat_d15xx.bin ${D}${nonarch_base_libdir}/firmware install -m 0755 ${S}/quickassist/qat/fw/qat_d15xx_mmp.bin ${D}${nonarch_base_libdir}/firmware - install -d ${D}${QAT_HEADER_FILES}/include - install -d ${D}${QAT_HEADER_FILES}/include/dc - install -d ${D}${QAT_HEADER_FILES}/include/lac - install -d ${D}${QAT_HEADER_FILES}/lookaside/access_layer/include - install -d ${D}${QAT_HEADER_FILES}/utilities/libusdm_drv - - install -m 640 ${S}/quickassist/include/*.h ${D}${QAT_HEADER_FILES}/include - install -m 640 ${S}/quickassist/include/dc/*.h ${D}${QAT_HEADER_FILES}/include/dc - install -m 640 ${S}/quickassist/include/lac/*.h ${D}${QAT_HEADER_FILES}/include/lac - install -m 640 ${S}/quickassist/lookaside/access_layer/include/*.h ${D}${QAT_HEADER_FILES}/lookaside/access_layer/include - install -m 640 ${S}/quickassist/utilities/libusdm_drv/*.h ${D}${QAT_HEADER_FILES}/utilities/libusdm_drv - - install -m 0755 ${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/calgary ${D}${nonarch_base_libdir}/firmware - install -m 0755 ${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/calgary32 ${D}${nonarch_base_libdir}/firmware - install -m 0755 ${S}/quickassist/lookaside/access_layer/src/sample_code/performance/compression/canterbury ${D}${nonarch_base_libdir}/firmware - #install qat source cp ${DL_DIR}/QAT.L.${PV}.tar.gz ${D}${prefix}/src/qat/ } - -SYSROOT_DIRS += "/opt" - -PACKAGES += "${PN}-app" - -FILES:${PN}-dev = "${QAT_HEADER_FILES}/ \ - ${nonarch_base_libdir}/*.a \ - " - -FILES:${PN} += "\ - ${libdir}/ \ - ${nonarch_base_libdir}/firmware \ - ${sysconfdir}/ \ - ${sbindir}/ \ - ${base_libdir}/*.so \ - ${prefix}/src/qat \ - " - -FILES:${PN}-dbg += "${sysconfdir}/init.d/.debug/ \ - " - -FILES:${PN}-app += "${bindir}/* \ - ${prefix}/qat \ - " - -# yasm encodes path to the input file and doesn't provide any option to workaround it. -INSANE_SKIP:${PN}-staticdev += "buildpaths" -INSANE_SKIP:${PN}-dbg += "buildpaths" diff --git a/recipes-extended/qat/qat20/0001-qat20-remove-local-path-from-makefile.patch b/recipes-extended/qat/qat20/0001-qat20-remove-local-path-from-makefile.patch new file mode 100644 index 0000000..750b0e2 --- /dev/null +++ b/recipes-extended/qat/qat20/0001-qat20-remove-local-path-from-makefile.patch @@ -0,0 +1,31 @@ +From 3d74581601ea33761bc00da996ca56719f25d55e Mon Sep 17 00:00:00 2001 +From: Lee Chee Yang <[email protected]> +Date: Tue, 14 Feb 2023 18:15:19 +0800 +Subject: [PATCH] qat20: remove local path from makefile + +Upstream-Status: Inappropriate [Configuration] + +Remove the host machine /usr/include path from makefile. + +Signed-off-by: Lee Chee Yang <[email protected]> + +--- + .../build_files/env_files/linux_2.6_user_space.mk | 5 ----- + 1 file changed, 5 deletions(-) + +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 +index 5565a7b..dd9c461 100644 +--- 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 +@@ -46,11 +46,6 @@ + # + #------------------------------------------------------------- + +-ifdef SYSROOT +-INCLUDES+=-I$(SYSROOT)/usr/include +-else +-INCLUDES+=-I/usr/include +-endif + + INCLUDES += -I$(API_DIR) + INCLUDES += -I$(OSAL_DIR)/include diff --git a/recipes-extended/qat/qat20/0001-utilities-adf_ctl-Allow-CXX-to-be-overridden.patch b/recipes-extended/qat/qat20/0001-utilities-adf_ctl-Allow-CXX-to-be-overridden.patch new file mode 100644 index 0000000..efe76d5 --- /dev/null +++ b/recipes-extended/qat/qat20/0001-utilities-adf_ctl-Allow-CXX-to-be-overridden.patch @@ -0,0 +1,28 @@ +From eb39390d69da73de469791ff77b8f69a5ae95d74 Mon Sep 17 00:00:00 2001 +From: Chee Yang Lee <[email protected]> +Date: Mon, 20 Feb 2023 15:20:40 +0800 +Subject: [PATCH] utilities/adf_ctl: Allow CXX to be overridden + +Upstream-Status: Inappropriate [Configuration] + +Signed-off-by: Chee Yang Lee <[email protected]> +--- + quickassist/utilities/adf_ctl/common.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/quickassist/utilities/adf_ctl/common.mk b/quickassist/utilities/adf_ctl/common.mk +index 26e1695..6c64dac 100644 +--- a/quickassist/utilities/adf_ctl/common.mk ++++ b/quickassist/utilities/adf_ctl/common.mk +@@ -87,7 +87,7 @@ EXTRA_LDFLAGS += --sysroot=$(SYSROOT) + EXTRA_CXXFLAGS += --sysroot=$(SYSROOT) + endif + +-CXX = $(CROSS_COMPILE)g++ ++CXX = g++ + CXXFLAGS += -std=c++0x + CXXFLAGS += -I$(KERNEL_SOURCE_DIR)/drivers/crypto/qat/qat_common + +-- +2.37.3 + diff --git a/recipes-extended/qat/qat20/0004-qat20-update-KDIR-for-cross-compilation.patch b/recipes-extended/qat/qat20/0004-qat20-update-KDIR-for-cross-compilation.patch new file mode 100644 index 0000000..a548630 --- /dev/null +++ b/recipes-extended/qat/qat20/0004-qat20-update-KDIR-for-cross-compilation.patch @@ -0,0 +1,37 @@ +From eaa7f5b312b3cf0afaa544253f4fce1a87904f80 Mon Sep 17 00:00:00 2001 +From: "Tan, Raymond" <[email protected]> +Date: Wed, 30 May 2018 22:17:58 +0800 +Subject: [PATCH] update KDIR for cross-compilation + +Upstream-Status: Inappropriate [Configuration] + +This patch updates the kernel path for cross-compilation, avoid using the host +machine path. + +Signed-off-by: Tan, Raymond <[email protected]> + +--- + quickassist/qat/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/quickassist/qat/Makefile b/quickassist/qat/Makefile +index 16aa3ef..48daf4a 100644 +--- a/quickassist/qat/Makefile ++++ b/quickassist/qat/Makefile +@@ -27,13 +27,13 @@ $(info Compiling with Debug Injection Simulation feature) + endif + + ifeq ($(KERNELRELEASE),) +-KDIR ?= $(INSTALL_MOD_PATH)/lib/modules/$(shell uname -r)/build +-ifneq ($(shell if [ -e $(KDIR)/include/config/auto.conf ]; then echo 1; fi),1) ++KDIR ?= $(KERNEL_SOURCE_ROOT) ++ifneq ($(shell if [ -e $(KERNEL_BUILDDIR)/include/config/auto.conf ]; then echo 1; fi),1) + $(error ERROR: Kernel header files not found. Install the appropriate \ + kernel development package necessary for building external kernel modules \ + or run 'make oldconfig && make modules_prepare' on kernel src to fix it) + endif +-include $(KDIR)/include/config/auto.conf ++include $(KERNEL_BUILDDIR)/include/config/auto.conf + INSTALL_FW_PATH ?= $(INSTALL_MOD_PATH)/lib/firmware + + #ifdef INTEL_NEXT diff --git a/recipes-extended/qat/qat20/0006-qat20-qat-add-install-target-and-add-folder.patch b/recipes-extended/qat/qat20/0006-qat20-qat-add-install-target-and-add-folder.patch new file mode 100644 index 0000000..42a50de --- /dev/null +++ b/recipes-extended/qat/qat20/0006-qat20-qat-add-install-target-and-add-folder.patch @@ -0,0 +1,68 @@ +From 7003d4d6334c197cc83e51a2ceaa3b3a624fa956 Mon Sep 17 00:00:00 2001 +From: "Tan, Raymond" <[email protected]> +Date: Mon, 4 Jun 2018 09:26:33 +0800 +Subject: [PATCH] qat-add-install-target-and-add-folder + +Upstream-Status: Inappropriate [Configuration] + +Modify Makefile to add install target and add folder + +Signed-off-by: Tan, Raymond <[email protected]> + +--- + quickassist/Makefile | 25 ++++++++++++++++++++++--- + 1 file changed, 22 insertions(+), 3 deletions(-) + +diff --git a/quickassist/Makefile b/quickassist/Makefile +index 43e0544..6d6b724 100755 +--- a/quickassist/Makefile ++++ b/quickassist/Makefile +@@ -64,6 +64,7 @@ ICP_BUILD_OUTPUT?=build_$(DATE) + ICP_TOP_ENV=$(ICP_BUILDSYSTEM_PATH)/build_files/env_files/ + export ICP_ACCEL_INC=YES + LAC_LIB_DIR=$(LAC_PATH)/build/libs ++MODULE_INSTALLPATH=$(SAMPLE_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat + + #Release Package build steps + ALL_TARGETS = clean lac_lib_dir qat_direct libosal_user lac_user +@@ -79,10 +80,14 @@ all: $(ALL_TARGETS) + + user: lac_lib_dir libosal_user lac_user + ++install: output_dir install_scripts ++ @cp $(ICP_ROOT)/quickassist/utilities/libusdm_drv/usdm_drv.ko $(MODULE_INSTALLPATH); ++ @cp $(ICP_ROOT)/quickassist/lookaside/access_layer/src/sample_code/performance/build/linux_2.6/user_space/cpa_sample_code $(ICP_BUILD_OUTPUT)$(DEST_BINDIR); ++ + install_scripts: + @echo ; echo 'Copying Install Scripts'; +- @cp $(ICP_BUILDSYSTEM_PATH)/build_files/qat_service $(ICP_BUILD_OUTPUT)/; +- @chmod 750 $(ICP_BUILD_OUTPUT)/qat_service; ++ @cp $(ICP_BUILDSYSTEM_PATH)/build_files/qat_service $(ICP_BUILD_OUTPUT)/etc/init.d; ++ @chmod 750 $(ICP_BUILD_OUTPUT)/etc/init.d/qat_service; + + # + # Common memory driver +@@ -142,8 +147,22 @@ ifeq ($(ICP_NO_CLEAN),) + endif + + +-output_dir: clean ++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)$(DEST_BINDIR) || mkdir -p $(ICP_BUILD_OUTPUT)$(DEST_BINDIR); ++ test -d $(ICP_BUILD_OUTPUT)/lib/firmware || mkdir -p $(ICP_BUILD_OUTPUT)/lib/firmware; ++ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat; ++ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_common || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_common; ++ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_c3xxx || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_c3xxx; ++ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_c3xxxvf || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_c3xxxvf; ++ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_c62x || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_c62x; ++ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_c62xvf || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_c62xvf; ++ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_dh895xcc || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_dh895xcc; ++ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_dh895xccvf || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_dh895xccvf; ++ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_d15xx || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_d15xx; ++ test -d $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_d15xxvf || mkdir -p $(ICP_BUILD_OUTPUT)/lib/modules/$(QAT_KERNEL_VER)/updates/drivers/crypto/qat/qat_d15xxvf; ++ test -d $(ICP_BUILD_OUTPUT)/etc/init.d || mkdir -p $(ICP_BUILD_OUTPUT)/etc/init.d; + + lac_lib_dir: clean + test -d $(LAC_LIB_DIR) || mkdir -p $(LAC_LIB_DIR); diff --git a/recipes-extended/qat/qat20_1.0.0-00021.bb b/recipes-extended/qat/qat20_1.0.0-00021.bb new file mode 100644 index 0000000..d7da15e --- /dev/null +++ b/recipes-extended/qat/qat20_1.0.0-00021.bb @@ -0,0 +1,22 @@ +require qat.inc + +SRC_URI = "https://downloadmirror.intel.com/765523/QAT20.L.1.0.0-00021.tar.gz;subdir=qat20 \ + file://0001-qat-fix-for-cross-compilation-issue.patch \ + file://0001-qat20-remove-local-path-from-makefile.patch \ + file://0003-qat-override-CC-LD-AR-only-when-it-is-not-define.patch \ + file://0004-qat20-update-KDIR-for-cross-compilation.patch \ + file://0005-Added-include-dir-path.patch \ + file://0006-qat20-qat-add-install-target-and-add-folder.patch \ + file://0001-usdm_drv-convert-mutex_lock-to-mutex_trylock-to-avio.patch \ + file://0001-utilities-adf_ctl-Allow-CXX-to-be-overridden.patch \ + " + +SRC_URI[sha256sum] = "d705492e04f633ff8494304db6166b9f3562068bf7ef3a21bdee73410413922d" + +S = "${WORKDIR}/qat20" + +do_install:append() { + #install qat source + cp ${DL_DIR}/QAT20.L.${PV}.tar.gz ${D}${prefix}/src/qat/ +} + -- 2.37.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7842): https://lists.yoctoproject.org/g/meta-intel/message/7842 Mute This Topic: https://lists.yoctoproject.org/mt/97102711/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
