Commit e9a43503 authored by Michal Berger's avatar Michal Berger Committed by Ben Walker
Browse files

pkgdep/git: Patch QAT driver for changes in crypto API 



Details here:

git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0eb76ba29d16df2951d37c54ca279c4e5630b071

Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Change-Id: Ica523bc4ec6b68fab2549a02476872b4d250a8f0
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8041


Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent b7cc001a

test/common/config/pkgdep/git

+6 −0
Original line number Diff line number Diff line
@@ -158,6 +158,12 @@ function install_qat() { 
		# qat_algs_ablkcipher.c doesn't exist in older versions of the driver so simply force the patch

		patch --force --dir="$GIT_REPOS/QAT" -p1

	fi < "$rootdir/test/common/config/pkgdep/patches/qat/0001-sha.patch" || :



	# cipher routines were moved from crypto.h to crypto/internal/cipher.h in kernels >= 5.12

	if ((kernel_ver >= 0x050c00)); then

		patch --dir="$GIT_REPOS/QAT" -p1

	fi < "$rootdir/test/common/config/pkgdep/patches/qat/0001-cipher-ns.patch"



	(cd "$GIT_REPOS/QAT" && sudo ./configure --enable-icp-sriov=host && sudo make install)



	if ! sudo service qat_service start; then

test/common/config/pkgdep/patches/qat/0001-cipher-ns.patch

0 → 100644
+28 −0
Original line number Diff line number Diff line 
Cipher routines were moved to their own header file and the symbol exports

are now available under a new namespace, CRYPTO_INTERNAL.



Details: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0eb76ba29d16df2951d37c54ca279c4e5630b071

---



diff --git a/quickassist/lookaside/access_layer/src/linux/icp_qa_module.c b/quickassist/lookaside/access_layer/src/linux/icp_qa_module.c

index 413eb07..f7d09bd 100644

--- a/quickassist/lookaside/access_layer/src/linux/icp_qa_module.c

+++ b/quickassist/lookaside/access_layer/src/linux/icp_qa_module.c

@@ -120,3 +120,4 @@ module_exit(kapi_mod_exit);

 MODULE_DESCRIPTION("Intel(R) Quickassist Technology Acceleration Driver");

 MODULE_AUTHOR("Intel");

 MODULE_LICENSE("Dual BSD/GPL");

+MODULE_IMPORT_NS(CRYPTO_INTERNAL);

diff --git a/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c b/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c

index 9d2e85c..f265422 100644

--- a/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c

+++ b/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c

@@ -65,7 +65,7 @@

  */

 

 #include "Osal.h"

-#include <linux/crypto.h>

+#include <crypto/internal/cipher.h>

 #include <linux/version.h>

 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))

 #include <crypto/internal/hash.h>