qat17: update to version 1.7.l.4.12.0-00011

Removed patches:
    qat17_4.7.0-00006-Drop-pr_warning-definition.patch
    qat17_4.7.0-00006-Link-driver-with-object-files.patch
    qat17_4.7.0-00006-Switch-to-skcipher-API.patch
    qat17_4.7.0-00006-crypto-qat-adf_aer-Remove-pci_cleanup_aer_uncorrect_.patch
    qat17_4.7.0-00006-make-it-compatible-with-kernel-5.6.patch
    qat17_4.7.0-00006-qat-replace-linux-cryptohash.h-with-crypto-sha.h-for.patch
    use-CC-for-LD.patch

Renamed and rebased patches:
    qat16_2.3.0-34-qat-fix-for-cross-compilation-issue.patch
 => 0001-qat-fix-for-cross-compilation-issue.patch

    qat16_2.3.0-34-qat-remove-local-path-from-makefile.patch
 => 0002-qat-remove-local-path-from-makefile.patch

    qat16_2.6.0-65-qat-override-CC-LD-AR-only-when-it-is-not-define.patch
 => 0003-qat-override-CC-LD-AR-only-when-it-is-not-define.patch

    qat17_0.6.0-1-qat-update-KDIR-for-cross-compilation.patch
 => 0004-update-KDIR-for-cross-compilation.patch

    qat17_0.8.0-37-qat-added-include-dir-path.patch
 => 0005-Added-include-dir-path.patch

    qat17_0.9.0-4-qat-add-install-target-and-add-folder.patch
 => 0006-qat-add-install-target-and-add-folder.patch

    qat17_4.1.0-00022-qat-use-static-lib-for-linking.patch
 => 0007-qat-use-static-lib-for-linking-under-cpa-sample-code.patch

    qat17_4.7.0-00006-overwrite-KBUILD_BUILTIN-in-kernel-s-Makefile.patch
 => 0008-qat-overwrite-KBUILD_BUILTIN-in-kernel-s-Makefile.patch

    qat17_4.7.0-00006-crypto-qat-Silence-smp_processor_id-warning.patch
 => 0009-crypto-qat-Silence-smp_processor_id-warning.patch

    qat17_4.7.0-00006-qat-include-sha1.h-and-sha2.h-instead-of-sha.h-in-ke.patch
 => 0010-qat-include-sha1.h-and-sha2.h-instead-of-sha.h-in-ke.patch

    qat17_4.7.0-00006-qat17-use-namespace-CRYPTO_INTERNAL.patch
 => 0011-qat17-use-namespace-CRYPTO_INTERNAL.patch

Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>

1 files changed, 47 insertions, 0 deletions

diff --git a/recipes-extended/qat/files/0011-qat17-use-namespace-CRYPTO_INTERNAL.patch b/recipes-extended/qat/files/0011-qat17-use-namespace-CRYPTO_INTERNAL.patch
new file mode 100644
index 0000000..1a7a647
--- /dev/null
+++ b/recipes-extended/qat/files/0011-qat17-use-namespace-CRYPTO_INTERNAL.patch
@@ -0,0 +1,47 @@
+From 9b2b7a79fc9d9323fe9ec44de7619ea175c45bc1 Mon Sep 17 00:00:00 2001
+From: Yongxin Liu <yongxin.liu@windriver.com>
+Date: Tue, 23 Mar 2021 09:31:25 +0000
+Subject: [PATCH 11/11] qat17: use namespace CRYPTO_INTERNAL
+
+Due to kernel commit 0eb76ba29d16 ("crypto: remove cipher routines from
+public crypto API") in v5.12-rc1, some crypto APIs are exported into a new
+namespace CRYPTO_INTERNAL.
+
+Upstream-Status: Inappropriate [Code released in tarball form only]
+
+Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com>
+---
+ quickassist/lookaside/access_layer/src/linux/icp_qa_module.c         | 3 +++
+ .../utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c      | 5 +++++
+ 2 files changed, 8 insertions(+)
+
+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..f3a371e 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,6 @@ module_exit(kapi_mod_exit);
+ MODULE_DESCRIPTION("Intel(R) Quickassist Technology Acceleration Driver");
+ MODULE_AUTHOR("Intel");
+ MODULE_LICENSE("Dual BSD/GPL");
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,12,0))
++MODULE_IMPORT_NS(CRYPTO_INTERNAL);
++#endif
+diff --git a/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c b/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c
+index de24fa0..96c29c0 100644
+--- a/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c
++++ b/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c
+@@ -75,6 +75,11 @@
+ #else
+ #include <crypto/sha.h>
+ #endif
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,12,0))
++#include <crypto/internal/cipher.h>
++#include <linux/module.h>
++MODULE_IMPORT_NS(CRYPTO_INTERNAL);
++#endif
+ 
+ #define OSAL_MAX_SHASH_DECSIZE 512
+ 
+-- 
+2.14.5
+