From: Chee Yang Lee <[email protected]> these changes is in 4.22, hence drop these patch. qat17-change-PMD_PAGE_SIZE-to-PMD_SIZE-for-kernel-v6.patch qat17-move-reqsize-into-tfm-for-kernel-v6.2.patch
License-Update: license file "LICENSE.BSD" update copyright time to 2023. Signed-off-by: Chee Yang Lee <[email protected]> --- ..._PAGE_SIZE-to-PMD_SIZE-for-kernel-v6.patch | 35 ---------- ...ove-reqsize-into-tfm-for-kernel-v6.2.patch | 65 ------------------- ..._4.20.0-00001.bb => qat17_4.22.0-00001.bb} | 8 +-- 3 files changed, 3 insertions(+), 105 deletions(-) delete mode 100644 recipes-extended/qat/files/qat17-change-PMD_PAGE_SIZE-to-PMD_SIZE-for-kernel-v6.patch delete mode 100644 recipes-extended/qat/files/qat17-move-reqsize-into-tfm-for-kernel-v6.2.patch rename recipes-extended/qat/{qat17_4.20.0-00001.bb => qat17_4.22.0-00001.bb} (95%) diff --git a/recipes-extended/qat/files/qat17-change-PMD_PAGE_SIZE-to-PMD_SIZE-for-kernel-v6.patch b/recipes-extended/qat/files/qat17-change-PMD_PAGE_SIZE-to-PMD_SIZE-for-kernel-v6.patch deleted file mode 100644 index b1e40db..0000000 --- a/recipes-extended/qat/files/qat17-change-PMD_PAGE_SIZE-to-PMD_SIZE-for-kernel-v6.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5c51a64f97e1e149df206fed00f5414f73e1e07a Mon Sep 17 00:00:00 2001 -From: Yongxin Liu <[email protected]> -Date: Wed, 1 Mar 2023 01:39:47 +0000 -Subject: [PATCH] qat17: change PMD_PAGE_SIZE to PMD_SIZE for kernel v6.2 - -In kernel commit 82328227db8f ("x86/mm: Remove P*D_PAGE_MASK and -P*D_PAGE_SIZE macros"), P*D_PAGE_MASK and P*D_PAGE_SIZE were removed. -P*D_MASK and P*D_SIZE are used instead. - -Upstream-Status: Inappropriate [Code released in tarball form only] - -Signed-off-by: Yongxin Liu <[email protected]> ---- - .../utilities/libusdm_drv/linux/kernel_space/qae_mem_drv.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/quickassist/utilities/libusdm_drv/linux/kernel_space/qae_mem_drv.c b/quickassist/utilities/libusdm_drv/linux/kernel_space/qae_mem_drv.c -index 8e8d76e..ae96d3f 100644 ---- a/quickassist/utilities/libusdm_drv/linux/kernel_space/qae_mem_drv.c -+++ b/quickassist/utilities/libusdm_drv/linux/kernel_space/qae_mem_drv.c -@@ -848,7 +848,11 @@ dev_get_user_page(struct file *fp, uint32_t cmd, unsigned long arg) - { - if (PageHuge(page)) - { -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0)) -+ if (user_mem_info.size != PMD_SIZE) -+#else - if (user_mem_info.size != PMD_PAGE_SIZE) -+#endif - { - mm_err("%s:%d dev_get_user_page: user_mem_info.size is not " - "equal to hugepage_size, ret=%d\n", --- -2.39.1 - diff --git a/recipes-extended/qat/files/qat17-move-reqsize-into-tfm-for-kernel-v6.2.patch b/recipes-extended/qat/files/qat17-move-reqsize-into-tfm-for-kernel-v6.2.patch deleted file mode 100644 index 9cc49ec..0000000 --- a/recipes-extended/qat/files/qat17-move-reqsize-into-tfm-for-kernel-v6.2.patch +++ /dev/null @@ -1,65 +0,0 @@ -From cee000ba295057ea8b5d93531b2896934674a7f3 Mon Sep 17 00:00:00 2001 -From: Yongxin Liu <[email protected]> -Date: Wed, 1 Mar 2023 01:40:00 +0000 -Subject: [PATCH] qat17: move reqsize into tfm for kernel v6.2 - -In mainline kernel commits 3e71e5b0efcc ("crypto: akcipher - Move reqsize -into tfm") and 4d2b225a67e6 (crypto: kpp - Move reqsize into tfm), -reqsize was moved from struct akcipher_alg and kpp_alg to tfm. - -Upstream-Status: Inappropriate [Code released in tarball form only] - -Signed-off-by: Yongxin Liu <[email protected]> ---- - .../drivers/crypto/qat/qat_common/qat_asym_algs.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/quickassist/qat/drivers/crypto/qat/qat_common/qat_asym_algs.c b/quickassist/qat/drivers/crypto/qat/qat_common/qat_asym_algs.c -index ec410cc..359f7b1 100644 ---- a/quickassist/qat/drivers/crypto/qat/qat_common/qat_asym_algs.c -+++ b/quickassist/qat/drivers/crypto/qat/qat_common/qat_asym_algs.c -@@ -504,6 +504,10 @@ static int qat_dh_init_tfm(struct crypto_kpp *tfm) - if (!inst) - return -EINVAL; - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0)) -+ kpp_set_reqsize(tfm, sizeof(struct qat_asym_request) + 64); -+#endif -+ - ctx->p_size = 0; - ctx->g2 = false; - ctx->inst = inst; -@@ -1252,6 +1256,10 @@ static int qat_rsa_init_tfm(struct crypto_akcipher *tfm) - if (!inst) - return -EINVAL; - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0)) -+ akcipher_set_reqsize(tfm, sizeof(struct qat_asym_request) + 64); -+#endif -+ - ctx->key_sz = 0; - ctx->inst = inst; - return 0; -@@ -1276,7 +1284,9 @@ static struct akcipher_alg rsa = { - .max_size = qat_rsa_max_size, - .init = qat_rsa_init_tfm, - .exit = qat_rsa_exit_tfm, -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6,2,0)) - .reqsize = sizeof(struct qat_asym_request) + 64, -+#endif - .base = { - .cra_name = "rsa", - .cra_driver_name = "qat-rsa", -@@ -1294,7 +1304,9 @@ static struct kpp_alg dh = { - .max_size = qat_dh_max_size, - .init = qat_dh_init_tfm, - .exit = qat_dh_exit_tfm, -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6,2,0)) - .reqsize = sizeof(struct qat_asym_request) + 64, -+#endif - .base = { - .cra_name = "dh", - .cra_driver_name = "qat-dh", --- -2.39.1 - diff --git a/recipes-extended/qat/qat17_4.20.0-00001.bb b/recipes-extended/qat/qat17_4.22.0-00001.bb similarity index 95% rename from recipes-extended/qat/qat17_4.20.0-00001.bb rename to recipes-extended/qat/qat17_4.22.0-00001.bb index 3e317c3..0ee4119 100644 --- a/recipes-extended/qat/qat17_4.20.0-00001.bb +++ b/recipes-extended/qat/qat17_4.22.0-00001.bb @@ -5,14 +5,14 @@ HOMEPAGE = "https://www.intel.com/content/www/us/en/developer/topic-technology/o LICENSE = "BSD-3-Clause & GPL-2.0-only" LIC_FILES_CHKSUM = "\ file://LICENSE.GPL;md5=751419260aa954499f7abaabaa882bbe \ - file://LICENSE.BSD;md5=4a6a5cd99f6064d61adad8c6c0bd080f \ + file://LICENSE.BSD;md5=7e3723742f05cc28b730c136742b3b80 \ " DEPENDS += "boost udev zlib openssl yasm-native" PROVIDES += "virtual/qat" TARGET_CC_ARCH += "${LDFLAGS}" -SRC_URI = "https://downloadmirror.intel.com/761891/QAT.L.4.20.0-00001.tar.gz;subdir=qat17 \ +SRC_URI = "https://downloadmirror.intel.com/780675/QAT.L.4.22.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,13 +21,11 @@ SRC_URI = "https://downloadmirror.intel.com/761891/QAT.L.4.20.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://qat17-move-reqsize-into-tfm-for-kernel-v6.2.patch \ - file://qat17-change-PMD_PAGE_SIZE-to-PMD_SIZE-for-kernel-v6.patch \ " do_configure[depends] += "virtual/kernel:do_shared_workdir" -SRC_URI[sha256sum] = "90ca71c551cbb963b261f528616f2be5085f23a87578f2325623cfb6511a32f7" +SRC_URI[sha256sum] = "b213f9c4c728405e8d4039633ec21012d5e2c8f39ba67a629a9530cd1b261238" COMPATIBLE_MACHINE = "null" COMPATIBLE_HOST:x86-x32 = 'null' -- 2.37.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8025): https://lists.yoctoproject.org/g/meta-intel/message/8025 Mute This Topic: https://lists.yoctoproject.org/mt/99921945/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
