diff --git a/test/common/config/pkgdep/patches/qat/0001-cipher-ns.patch b/test/common/config/pkgdep/patches/qat/0001-cipher-ns.patch deleted file mode 100644 index 8c9f29c5a..000000000 --- a/test/common/config/pkgdep/patches/qat/0001-cipher-ns.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 -+#include - #include - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) - #include diff --git a/test/common/config/pkgdep/patches/qat/0001-cryptohash.patch b/test/common/config/pkgdep/patches/qat/0001-cryptohash.patch deleted file mode 100644 index 2d87c8f36..000000000 --- a/test/common/config/pkgdep/patches/qat/0001-cryptohash.patch +++ /dev/null @@ -1,17 +0,0 @@ -cryptohash.h was dropped and merged with crypto/sha.sh in 5.8 kernel. Details in: -https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=228c4f265c6eb60eaa4ed0edb3bf7c113173576c - ---- -diff --git a/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c b/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c -index 4c389da..e602377 100644 ---- a/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c -+++ b/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c -@@ -66,7 +66,7 @@ - - #include "Osal.h" - #include --#include -+#include - #include - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) - #include diff --git a/test/common/config/pkgdep/patches/qat/0001-pci_aer.patch b/test/common/config/pkgdep/patches/qat/0001-pci_aer.patch deleted file mode 100644 index 7516ac4fe..000000000 --- a/test/common/config/pkgdep/patches/qat/0001-pci_aer.patch +++ /dev/null @@ -1,20 +0,0 @@ -In kernel 5.7 the pci_cleanup_aer_uncorrect_error_status() function was -renamed with the following commit: - -git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=894020fdd88c1e9a74c60b67c0f19f1c7696ba2f - -This simply updates the function call with the proper name (pci_aer_clear_nonfatal_status()). - ---- -diff --git a/quickassist/qat/drivers/crypto/qat/qat_common/adf_aer.c b/quickassist/qat/drivers/crypto/qat/qat_common/adf_aer.c -index a6ce6df..545bb79 100644 ---- a/quickassist/qat/drivers/crypto/qat/qat_common/adf_aer.c -+++ b/quickassist/qat/drivers/crypto/qat/qat_common/adf_aer.c -@@ -304,7 +304,7 @@ static pci_ers_result_t adf_slot_reset(struct pci_dev *pdev) - pr_err("QAT: Can't find acceleration device\n"); - return PCI_ERS_RESULT_DISCONNECT; - } -- pci_cleanup_aer_uncorrect_error_status(pdev); -+ pci_aer_clear_nonfatal_status(pdev); - if (adf_dev_aer_schedule_reset(accel_dev, ADF_DEV_RESET_SYNC)) - return PCI_ERS_RESULT_DISCONNECT; diff --git a/test/common/config/pkgdep/patches/qat/0001-pci_aer_centos.patch b/test/common/config/pkgdep/patches/qat/0001-pci_aer_centos.patch deleted file mode 100644 index 580f68a64..000000000 --- a/test/common/config/pkgdep/patches/qat/0001-pci_aer_centos.patch +++ /dev/null @@ -1,26 +0,0 @@ -Latest kernels available for centos8 (4.18) include backport patches which -dropped use of pci_cleanup_aer_uncorrect_error_status(). Make sure this -call won't be referenced for kernels older than 5.7. To make it work, this -patch is going to be applied only when pci_cleanup_aer_uncorrect_error_status() -is not detected in older kernels (like the centos8's builds). ---- - quickassist/qat/compat/qat_compat.h | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/quickassist/qat/compat/qat_compat.h b/quickassist/qat/compat/qat_compat.h -index 06d640d..cee298c 100644 ---- a/quickassist/qat/compat/qat_compat.h -+++ b/quickassist/qat/compat/qat_compat.h -@@ -478,12 +478,6 @@ static inline void pci_ignore_hotplug(struct pci_dev *dev) - #define QAT_KPT_CAP_DISCOVERY - #endif - --#if ((SLE_VERSION_CODE && (SLE_VERSION(15, 2, 0) > SLE_VERSION_CODE)) || \ -- (!SLE_VERSION_CODE && KERNEL_VERSION(5, 7, 0) > LINUX_VERSION_CODE)) --#define pci_aer_clear_nonfatal_status(pdev) \ -- pci_cleanup_aer_uncorrect_error_status(pdev) --#endif /* SUSE15 SP2 */ -- - #if (KERNEL_VERSION(3, 17, 0) > LINUX_VERSION_CODE) - #ifndef ktime_get_real_ts64 - #define ktime_get_real_ts64 getnstimeofday diff --git a/test/common/config/pkgdep/patches/qat/0001-set-obj-m.patch b/test/common/config/pkgdep/patches/qat/0001-set-obj-m.patch deleted file mode 100644 index 1c19373ea..000000000 --- a/test/common/config/pkgdep/patches/qat/0001-set-obj-m.patch +++ /dev/null @@ -1,21 +0,0 @@ -Due to git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit?id=6212804f2d78e86f15dba5b46a4065cbf1403cde -built-in objects are not being built for the external modules anymore. To mitigate, don't set obj-m to an empty -list to force the build. - ---- -diff --git a/quickassist/build_system/build_files/OS/linux_2.6_kernel_space_rules.mk b/quickassist/build_system/build_files/OS/linux_2.6_kernel_space_rules.mk -index 71bbeb7..324fa96 100644 ---- a/quickassist/build_system/build_files/OS/linux_2.6_kernel_space_rules.mk -+++ b/quickassist/build_system/build_files/OS/linux_2.6_kernel_space_rules.mk -@@ -72,7 +72,7 @@ endif - - $(LIB_STATIC): dirs - @echo 'Creating static library ${LIB_STATIC}'; \ -- $(MAKE) -C $(KERNEL_SOURCE_ROOT)/ M=$(PWD) obj-m=""; \ -+ $(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); \ --- -2.26.2 - diff --git a/test/common/config/pkgdep/patches/qat/0001-sha.patch b/test/common/config/pkgdep/patches/qat/0001-sha.patch deleted file mode 100644 index 6a27dcd5f..000000000 --- a/test/common/config/pkgdep/patches/qat/0001-sha.patch +++ /dev/null @@ -1,66 +0,0 @@ -sha.h was split in >= 5.11.x kernel into sha1.h and sha2.h via the following commit: - -git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a24d22b225ce158651378869a6b88105c4bdb887 - - ---- - quickassist/qat/drivers/crypto/qat/qat_common/qat_algs.c | 2 +- - .../qat/drivers/crypto/qat/qat_common/qat_algs_ablkcipher.c | 2 +- - quickassist/qat/drivers/crypto/qat/qat_common/qat_algs_old.c | 2 +- - .../osal/src/linux/kernel_space/OsalCryptoInterface.c | 3 ++- - 4 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/quickassist/qat/drivers/crypto/qat/qat_common/qat_algs.c b/quickassist/qat/drivers/crypto/qat/qat_common/qat_algs.c -index 37ac11e..b07982c 100644 ---- a/quickassist/qat/drivers/crypto/qat/qat_common/qat_algs.c -+++ b/quickassist/qat/drivers/crypto/qat/qat_common/qat_algs.c -@@ -52,7 +52,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -diff --git a/quickassist/qat/drivers/crypto/qat/qat_common/qat_algs_ablkcipher.c b/quickassist/qat/drivers/crypto/qat/qat_common/qat_algs_ablkcipher.c -index 417e0db..0236d52 100644 ---- a/quickassist/qat/drivers/crypto/qat/qat_common/qat_algs_ablkcipher.c -+++ b/quickassist/qat/drivers/crypto/qat/qat_common/qat_algs_ablkcipher.c -@@ -51,7 +51,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -diff --git a/quickassist/qat/drivers/crypto/qat/qat_common/qat_algs_old.c b/quickassist/qat/drivers/crypto/qat/qat_common/qat_algs_old.c -index e30dead..5941f4c 100644 ---- a/quickassist/qat/drivers/crypto/qat/qat_common/qat_algs_old.c -+++ b/quickassist/qat/drivers/crypto/qat/qat_common/qat_algs_old.c -@@ -53,7 +53,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -diff --git a/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c b/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c -index 9d2e85c..4088eda 100644 ---- a/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c -+++ b/quickassist/utilities/osal/src/linux/kernel_space/OsalCryptoInterface.c -@@ -69,7 +69,8 @@ - #include - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)) - #include --#include -+#include -+#include - - #define OSAL_MAX_SHASH_DECSIZE 512 - --- diff --git a/test/common/config/pkgdep/patches/qat/0001-timespec.patch b/test/common/config/pkgdep/patches/qat/0001-timespec.patch deleted file mode 100644 index 04fb053e1..000000000 --- a/test/common/config/pkgdep/patches/qat/0001-timespec.patch +++ /dev/null @@ -1,35 +0,0 @@ -This patch attempts to expose timespec and getnstimeofday which were -explicitly hidden in the 5.6 kernel with the introduction of the -following commits: - -git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c766d1472c70d25ad475cf56042af1652e792b23 -git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=412c53a680a97cb1ae2c0ab60230e193bee86387 - -Code received from users@dpdk.org, issue tracked under QATE-59888. - ---- -diff --git a/quickassist/lookaside/access_layer/src/sample_code/performance/framework/linux/kernel_space/cpa_sample_code_utils.c b/quickassist/lookaside/access_layer/src/sample_code/performance/framework/linux/kernel_space/cpa_sample_code_utils.c -index 4639834..523e376 100644 ---- a/quickassist/lookaside/access_layer/src/sample_code/performance/framework/linux/kernel_space/cpa_sample_code_utils.c -+++ b/quickassist/lookaside/access_layer/src/sample_code/performance/framework/linux/kernel_space/cpa_sample_code_utils.c -@@ -107,6 +107,8 @@ atomic_t arrived; - extern struct device perf_device; - #endif - -+#define timespec timespec64 -+#define getnstimeofday ktime_get_real_ts64 - - /* Define a number for timeout */ - #define SAMPLE_CODE_MAX_LONG (0x7FFFFFFF) -diff --git a/quickassist/qat/compat/qat_compat.h b/quickassist/qat/compat/qat_compat.h -index 2a02eaf..3515092 100644 ---- a/quickassist/qat/compat/qat_compat.h -+++ b/quickassist/qat/compat/qat_compat.h -@@ -466,4 +466,7 @@ static inline void pci_ignore_hotplug(struct pci_dev *dev) - #if (RHEL_RELEASE_CODE && RHEL_RELEASE_VERSION(7, 3) <= RHEL_RELEASE_CODE) - #define QAT_KPT_CAP_DISCOVERY - #endif -+ -+#define timespec timespec64 -+#define getnstimeofday ktime_get_real_ts64 - #endif /* _QAT_COMPAT_H_ */