Build dependency has changed from yasm to nasm.

This upgrade also require to enable CONFIG_PCIEAER [1].

This version supports v1.8 hardware too [2].

Current v4.23.0-00001 does not build with v6.6 kernel, causing following build
errors due to [3]:

qat17/4.23.0-00001/qat17/quickassist/qat/drivers/crypto/qat/qat_common/adf_aer.c:
 In function 'adf_enable_aer':
qat17/4.23.0-00001/qat17/quickassist/qat/drivers/crypto/qat/qat_common/
adf_aer.c:429:9: error:
implicit declaration of function 'pci_enable_pcie_error_reporting' 
[-Werror=implicit-function-declaration]
        pci_enable_pcie_error_reporting(pdev);
       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
qat17/4.23.0-00001/qat17/quickassist/qat/drivers/crypto/qat/qat_common/adf_aer.c:
 In function 'adf_disable_aer':
qat17/4.23.0-00001/qat17/quickassist/qat/drivers/crypto/qat/qat_common/
adf_aer.c:448:9: error:
implicit declaration of function 'pci_disable_pcie_error_reporting' 
[-Werror=implicit-function-declaration]
        pci_disable_pcie_error_reporting(pdev);

[1] 
https://github.com/torvalds/linux/blob/296455ade1fdcf5f8f8c033201633b60946c589a/include/linux/pci.h#L339
[2] 
https://www.intel.com/content/www/us/en/download/19734/intel-quickassist-technology-driver-for-linux-hw-version-1-x.html
[3]
https://github.com/torvalds/linux/commit/7ec4b34be4234599cf1241ef807cdb7c3636f6fe
https://github.com/torvalds/linux/commit/69b264df8a412820e98867dbab871c6526c5e5aa

Signed-off-by: Naveen Saini <[email protected]>
---
 recipes-extended/qat/files/build_fix.patch    | 40 +++++++++++++++++++
 ..._4.23.0-00001.bb => qat17_4.24.0-00005.bb} |  7 ++--
 2 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 recipes-extended/qat/files/build_fix.patch
 rename recipes-extended/qat/{qat17_4.23.0-00001.bb => qat17_4.24.0-00005.bb} 
(96%)

diff --git a/recipes-extended/qat/files/build_fix.patch 
b/recipes-extended/qat/files/build_fix.patch
new file mode 100644
index 0000000..8f3d187
--- /dev/null
+++ b/recipes-extended/qat/files/build_fix.patch
@@ -0,0 +1,40 @@
+--- 
qat/quickassist/build_system/build_files/OS/linux_2.6_kernel_space_rules.mk     
   2023-12-06 17:31:40.099741000 +0800
++++ 
qat-new/quickassist/build_system/build_files/OS/linux_2.6_kernel_space_rules.mk 
   2024-01-17 17:44:35.946289745 +0800
+
+Here objective is to get object files in kernel space for the
+static library (libosal.a), but overwriting already defined obj-m to empty and
+passing KBUILD_BUILTIN=1 causing following failures:
+
+| make[3]: Entering directory 
'build/tmp/work-shared/intel-corei7-64/kernel-source'
+| make[4]: Entering directory 
'build/tmp/work-shared/intel-corei7-64/kernel-build-artifacts'
+| make[5]: *** No rule to make target 'vmlinux.o', needed by 'modpost'.  Stop.
+| make[4]: *** 
[build/tmp/work-shared/intel-corei7-64/kernel-source/Makefile:234: __sub-make] 
Error 2
+| make[4]: Leaving directory 
'build/tmp/work-shared/intel-corei7-64/kernel-build-artifacts'
+| make[3]: *** [Makefile:234: __sub-make] Error 2
+| make[3]: Leaving directory 
'build/tmp/work-shared/intel-corei7-64/kernel-source'
+| Copying outputs
+| mv: cannot stat 'OsalServices.o': No such file or directory
+| mv: cannot stat 'OsalSemaphore.o': No such file or directory
+| mv: cannot stat 'OsalSpinLock.o': No such file or directory
+| mv: cannot stat 'OsalThread.o': No such file or directory
+| mv: cannot stat 'OsalAtomic.o': No such file or directory
+| mv: cannot stat 'OsalMemMgmt.o': No such file or directory
+| mv: cannot stat 'OsalIOMMUMgmt.o': No such file or directory
+| mv: cannot stat 'OsalUsrKrlProxy.o': No such file or directory
+| mv: cannot stat 'OsalCryptoInterface.o': No such file or directory
+
+Keeping this fix for now, until proper fix is available in upstream.
+
+Upstream-Status: Pending
+
+Signed-off-by: Naveen Saini <[email protected]>
+
+@@ -72,7 +72,7 @@
+ 
+ $(LIB_STATIC): dirs
+       @echo 'Creating static library ${LIB_STATIC}'; \
+-      $(MAKE) -C $(KERNEL_SOURCE_ROOT)/ M=$(PWD) obj-m="" KBUILD_BUILTIN=1; \
++      $(MAKE) -C $(KERNEL_SOURCE_ROOT)/ M=$(PWD); \
+       echo 'Copying outputs';\
+       test -f lib.a  &&  (ar -t lib.a | xargs ar -rcsD $(LIB_STATIC)); \
+       test -f $(LIB_STATIC)  &&  mv -f $(LIB_STATIC) 
$($(PROG_ACY)_FINAL_OUTPUT_DIR)/$(LIB_STATIC); \
diff --git a/recipes-extended/qat/qat17_4.23.0-00001.bb 
b/recipes-extended/qat/qat17_4.24.0-00005.bb
similarity index 96%
rename from recipes-extended/qat/qat17_4.23.0-00001.bb
rename to recipes-extended/qat/qat17_4.24.0-00005.bb
index c27c306..f875334 100644
--- a/recipes-extended/qat/qat17_4.23.0-00001.bb
+++ b/recipes-extended/qat/qat17_4.24.0-00005.bb
@@ -7,12 +7,12 @@ LIC_FILES_CHKSUM = "\
                     file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \
                     file://LICENSE.BSD;md5=7e3723742f05cc28b730c136742b3b80 \
                     "
-DEPENDS += "boost udev zlib openssl yasm-native"
+DEPENDS += "boost udev zlib openssl nasm-native"
 PROVIDES += "virtual/qat"
 
 TARGET_CC_ARCH += "${LDFLAGS}"
 
-SRC_URI = 
"https://downloadmirror.intel.com/788561/QAT.L.4.23.0-00001.tar.gz;subdir=qat17 
\
+SRC_URI = 
"https://downloadmirror.intel.com/795697/QAT.L.4.24.0-00005.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 \
@@ -22,11 +22,12 @@ SRC_URI = 
"https://downloadmirror.intel.com/788561/QAT.L.4.23.0-00001.tar.gz;sub
            
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 \
+           file://build_fix.patch \
           "
 
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
 
-SRC_URI[sha256sum] = 
"7052322ce854c1c694186dbdaaa954d11d78273ece742e9b2afad91e0e4ba350"
+SRC_URI[sha256sum] = 
"d32546a312828ef0450ddb1543905b06880aa1eb46a8f3fad71a60292052292b"
 
 COMPATIBLE_MACHINE = "null"
 COMPATIBLE_HOST:x86-x32 = 'null'
-- 
2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8205): 
https://lists.yoctoproject.org/g/meta-intel/message/8205
Mute This Topic: https://lists.yoctoproject.org/mt/103823645/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to