From: Lee Chee Yang <[email protected]> refresh 0006-qat-add-install-target-and-add-folder.patch with fuzz fix.
update status for 0003-qat-override-CC-LD-AR-only-when-it-is-not-define.patch. update do_install to install all firmware. Signed-off-by: Lee Chee Yang <[email protected]> --- ...-CC-LD-AR-only-when-it-is-not-define.patch | 2 +- ...at-add-install-target-and-add-folder.patch | 10 +++--- ...efinition-of-crypto_request_complete.patch | 35 +++++++++++++++++++ ..._4.22.0-00001.bb => qat17_4.23.0-00001.bb} | 18 +++------- 4 files changed, 46 insertions(+), 19 deletions(-) create mode 100644 recipes-extended/qat/files/fix-redefinition-of-crypto_request_complete.patch rename recipes-extended/qat/{qat17_4.22.0-00001.bb => qat17_4.23.0-00001.bb} (90%) diff --git a/recipes-extended/qat/files/0003-qat-override-CC-LD-AR-only-when-it-is-not-define.patch b/recipes-extended/qat/files/0003-qat-override-CC-LD-AR-only-when-it-is-not-define.patch index f3b8fe6..b61f270 100644 --- a/recipes-extended/qat/files/0003-qat-override-CC-LD-AR-only-when-it-is-not-define.patch +++ b/recipes-extended/qat/files/0003-qat-override-CC-LD-AR-only-when-it-is-not-define.patch @@ -3,7 +3,7 @@ From: Rahul Kumar Gupta <[email protected]> Date: Mon, 12 Apr 2021 08:40:47 +0800 Subject: [PATCH 03/11] qat: override CC LD AR only when it is not define -Upstream-Status: Inappropriate [Configuration] +Upstream-Status: Pending To make sure that compiler linker and archiver will override only when it is not defined by the environment. diff --git a/recipes-extended/qat/files/0006-qat-add-install-target-and-add-folder.patch b/recipes-extended/qat/files/0006-qat-add-install-target-and-add-folder.patch index f1c00d9..a40d0c0 100644 --- a/recipes-extended/qat/files/0006-qat-add-install-target-and-add-folder.patch +++ b/recipes-extended/qat/files/0006-qat-add-install-target-and-add-folder.patch @@ -1,4 +1,4 @@ -From 4ade9b15d9154bbd767b934215606cc24d598da7 Mon Sep 17 00:00:00 2001 +From 9f4ddcc7ee9683cf766c83651762187f9f194c7b 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 @@ -14,7 +14,7 @@ Signed-off-by: Tan, Raymond <[email protected]> 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/quickassist/Makefile b/quickassist/Makefile -index cb0fe36..ede63bd 100644 +index 5e0418b..4ac824a 100644 --- a/quickassist/Makefile +++ b/quickassist/Makefile @@ -99,6 +99,7 @@ export ICP_PARAM_CHECK ?= y @@ -23,9 +23,9 @@ index cb0fe36..ede63bd 100644 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 = lac_user lac_kernel -@@ -116,10 +117,14 @@ all: $(ALL_TARGETS) +@@ -117,10 +118,14 @@ all: $(ALL_TARGETS) user: lac_lib_dir libosal_user lac_user @@ -42,7 +42,7 @@ index cb0fe36..ede63bd 100644 # # Common memory driver -@@ -202,8 +207,22 @@ ifeq ($(ICP_NO_CLEAN),) +@@ -203,8 +208,22 @@ ifeq ($(ICP_NO_CLEAN),) endif diff --git a/recipes-extended/qat/files/fix-redefinition-of-crypto_request_complete.patch b/recipes-extended/qat/files/fix-redefinition-of-crypto_request_complete.patch new file mode 100644 index 0000000..883be25 --- /dev/null +++ b/recipes-extended/qat/files/fix-redefinition-of-crypto_request_complete.patch @@ -0,0 +1,35 @@ +From 2c1ac0417957a7656eaa0132bf632c9e5d6a94d7 Mon Sep 17 00:00:00 2001 +From: Lee Chee Yang <[email protected]> +Date: Tue, 3 Oct 2023 15:07:42 +0800 +Subject: [PATCH] fix redefinition crypto_request_complete + +Fix : +| /poky/build/tmp/work-shared/intel-corei7-64/kernel-source/include/crypto/algapi.h:268:20: error: redefinition of 'crypto_request_complete' +| 268 | static inline void crypto_request_complete(struct crypto_async_request *req, +| | ^~~~~~~~~~~~~~~~~~~~~~~ +| In file included from <command-line>: + +linux kernel backported crypto_request_complete to 6.1.29. +https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/include/crypto?h=linux-6.1.y&id=c35e03eaece71101ff6cbf776b86403860ac8cc3 + +Upstream-Status: Pending + +Signed-off-by: Lee Chee Yang <[email protected]> + +--- + quickassist/qat/compat/qat_compat.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/quickassist/qat/compat/qat_compat.h b/quickassist/qat/compat/qat_compat.h +index 8fcd14a..51b8098 100644 +--- a/quickassist/qat/compat/qat_compat.h ++++ b/quickassist/qat/compat/qat_compat.h +@@ -510,7 +510,7 @@ static inline void pci_ignore_hotplug(struct pci_dev *dev) + void kfree_sensitive(const void *p); + #endif + +-#if (KERNEL_VERSION(6, 3, 0) > LINUX_VERSION_CODE) ++#if ((KERNEL_VERSION(6, 1, 29) > LINUX_VERSION_CODE) ) + static inline void crypto_request_complete(struct crypto_async_request *req, + int err) + { diff --git a/recipes-extended/qat/qat17_4.22.0-00001.bb b/recipes-extended/qat/qat17_4.23.0-00001.bb similarity index 90% rename from recipes-extended/qat/qat17_4.22.0-00001.bb rename to recipes-extended/qat/qat17_4.23.0-00001.bb index 0ee4119..5856cb2 100644 --- a/recipes-extended/qat/qat17_4.22.0-00001.bb +++ b/recipes-extended/qat/qat17_4.23.0-00001.bb @@ -12,7 +12,7 @@ PROVIDES += "virtual/qat" TARGET_CC_ARCH += "${LDFLAGS}" -SRC_URI = "https://downloadmirror.intel.com/780675/QAT.L.4.22.0-00001.tar.gz;subdir=qat17 \ +SRC_URI = "https://downloadmirror.intel.com/788561/QAT.L.4.23.0-00001.tar.gz;subdir=qat17 \ file://0001-qat-fix-for-cross-compilation-issue.patch \ file://0002-qat-remove-local-path-from-makefile.patch \ file://0003-qat-override-CC-LD-AR-only-when-it-is-not-define.patch \ @@ -21,11 +21,12 @@ SRC_URI = "https://downloadmirror.intel.com/780675/QAT.L.4.22.0-00001.tar.gz;sub file://0006-qat-add-install-target-and-add-folder.patch \ file://0001-usdm_drv-convert-mutex_lock-to-mutex_trylock-to-avio.patch \ file://qat-remove-the-deprecated-pci-dma-compat.h-API.patch \ + file://fix-redefinition-of-crypto_request_complete.patch \ " do_configure[depends] += "virtual/kernel:do_shared_workdir" -SRC_URI[sha256sum] = "b213f9c4c728405e8d4039633ec21012d5e2c8f39ba67a629a9530cd1b261238" +SRC_URI[sha256sum] = "7052322ce854c1c694186dbdaaa954d11d78273ece742e9b2afad91e0e4ba350" COMPATIBLE_MACHINE = "null" COMPATIBLE_HOST:x86-x32 = 'null' @@ -122,7 +123,7 @@ do_install() { 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/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/lookaside/access_layer/src/qat_direct/src/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} @@ -130,16 +131,7 @@ do_install() { 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 - - # ICE-D LCC - install -m 0755 ${S}/quickassist/qat/fw/qat_200xx.bin ${D}${nonarch_base_libdir}/firmware - install -m 0755 ${S}/quickassist/qat/fw/qat_200xx_mmp.bin ${D}${nonarch_base_libdir}/firmware - - # ICE-D HCC - install -m 0755 ${S}/quickassist/qat/fw/qat_c4xxx.bin ${D}${nonarch_base_libdir}/firmware - install -m 0755 ${S}/quickassist/qat/fw/qat_c4xxx_mmp.bin ${D}${nonarch_base_libdir}/firmware + install -m 0755 ${S}/quickassist/qat/fw/*.bin ${D}${nonarch_base_libdir}/firmware install -d ${D}${QAT_HEADER_FILES}/include install -d ${D}${QAT_HEADER_FILES}/include/dc -- 2.37.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8112): https://lists.yoctoproject.org/g/meta-intel/message/8112 Mute This Topic: https://lists.yoctoproject.org/mt/101773142/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
