From 587519af25da21e8a31430c93b7eebbade7df3b0 Mon Sep 17 00:00:00 2001 From: aiamadeus <42570690+aiamadeus@users.noreply.github.com> Date: Thu, 5 Jun 2025 22:09:01 +0800 Subject: [PATCH] cryptodev-linux: update to 1.14 Remove upstream backport. --- package/kernel/cryptodev-linux/Makefile | 9 ++- ...ev_verbosity-fix-build-for-linux-6.4.patch | 39 ------------- ...01-zero-copy-fix-build-for-linux-6.4.patch | 32 ----------- ...nux-version-ifdefs-from-v6.4-to-v6.5.patch | 56 ------------------- .../0004-fix-build-for-linux-6.7-rc1.patch | 33 ----------- .../0005-fix-build-for-linux-5.10.220+.patch | 11 ---- 6 files changed, 4 insertions(+), 176 deletions(-) delete mode 100644 package/kernel/cryptodev-linux/patches/0001-cryptodev_verbosity-fix-build-for-linux-6.4.patch delete mode 100644 package/kernel/cryptodev-linux/patches/0001-zero-copy-fix-build-for-linux-6.4.patch delete mode 100644 package/kernel/cryptodev-linux/patches/0003-move-recent-linux-version-ifdefs-from-v6.4-to-v6.5.patch delete mode 100644 package/kernel/cryptodev-linux/patches/0004-fix-build-for-linux-6.7-rc1.patch delete mode 100644 package/kernel/cryptodev-linux/patches/0005-fix-build-for-linux-5.10.220+.patch diff --git a/package/kernel/cryptodev-linux/Makefile b/package/kernel/cryptodev-linux/Makefile index d04aaeace..e588f604f 100644 --- a/package/kernel/cryptodev-linux/Makefile +++ b/package/kernel/cryptodev-linux/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=cryptodev-linux -PKG_VERSION:=1.13 -PKG_RELEASE:=2 +PKG_VERSION:=1.14 +PKG_RELEASE:=1 PKG_SOURCE_URL:=https://codeload.github.com/$(PKG_NAME)/$(PKG_NAME)/tar.gz/$(PKG_NAME)-$(PKG_VERSION)? PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=33b7915c46eb39a37110e88c681423c0dd0df25d784b6e1475ac3196367f0db5 +PKG_HASH:=67223d5bee4749028e78e87372cee3bca79d9a20f7b6cb915aa080c59d2a2d98 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING @@ -28,8 +28,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/cryptodev SUBMENU:=Cryptographic API modules TITLE:=Driver for cryptographic acceleration - URL:=http://cryptodev-linux.org/ - VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) + URL:=https://github.com/cryptodev-linux/cryptodev-linux DEPENDS:=+kmod-crypto-authenc +kmod-crypto-hash FILES:=$(PKG_BUILD_DIR)/cryptodev.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,cryptodev) diff --git a/package/kernel/cryptodev-linux/patches/0001-cryptodev_verbosity-fix-build-for-linux-6.4.patch b/package/kernel/cryptodev-linux/patches/0001-cryptodev_verbosity-fix-build-for-linux-6.4.patch deleted file mode 100644 index 2d958f904..000000000 --- a/package/kernel/cryptodev-linux/patches/0001-cryptodev_verbosity-fix-build-for-linux-6.4.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 99ae2a39ddc3f89c66d9f09783b591c0f2dbf2e9 Mon Sep 17 00:00:00 2001 -From: Gaurav Jain -Date: Wed, 28 Jun 2023 12:44:32 +0530 -Subject: [PATCH] cryptodev_verbosity: Fix build for Linux 6.4 - -register_sysctl_table api is removed in kernel. -migrate to the new api register_sysctl. - -child is also removed in linux 6.4 ctl_table struct. - -Signed-off-by: Gaurav Jain ---- - ioctl.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/ioctl.c -+++ b/ioctl.c -@@ -1246,7 +1246,9 @@ static struct ctl_table verbosity_ctl_ro - { - .procname = "ioctl", - .mode = 0555, -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)) - .child = verbosity_ctl_dir, -+#endif - }, - {}, - }; -@@ -1267,7 +1269,11 @@ static int __init init_cryptodev(void) - return rc; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)) - verbosity_sysctl_header = register_sysctl_table(verbosity_ctl_root); -+#else -+ verbosity_sysctl_header = register_sysctl(verbosity_ctl_root->procname, verbosity_ctl_dir); -+#endif - - pr_info(PFX "driver %s loaded.\n", VERSION); - diff --git a/package/kernel/cryptodev-linux/patches/0001-zero-copy-fix-build-for-linux-6.4.patch b/package/kernel/cryptodev-linux/patches/0001-zero-copy-fix-build-for-linux-6.4.patch deleted file mode 100644 index 4d2dd13ae..000000000 --- a/package/kernel/cryptodev-linux/patches/0001-zero-copy-fix-build-for-linux-6.4.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 592017c3a910a3905b1925aee88c4674e9a596b7 Mon Sep 17 00:00:00 2001 -From: Gaurav Jain -Date: Tue, 30 May 2023 17:09:42 +0530 -Subject: [PATCH] zero copy: Fix build for Linux 6.4 - -get_user_pages_remote api prototype is changed in kernel. -struct vm_area_struct **vmas argument is removed. -Migrate to the new API. - -Signed-off-by: Gaurav Jain ---- - zc.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - ---- a/zc.c -+++ b/zc.c -@@ -80,10 +80,14 @@ int __get_userbuf(uint8_t __user *addr, - ret = get_user_pages_remote(task, mm, - (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0, - pg, NULL, NULL); --#else -+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)) - ret = get_user_pages_remote(mm, - (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0, - pg, NULL, NULL); -+#else -+ ret = get_user_pages_remote(mm, -+ (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0, -+ pg, NULL); - #endif - #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0)) - up_read(&mm->mmap_sem); diff --git a/package/kernel/cryptodev-linux/patches/0003-move-recent-linux-version-ifdefs-from-v6.4-to-v6.5.patch b/package/kernel/cryptodev-linux/patches/0003-move-recent-linux-version-ifdefs-from-v6.4-to-v6.5.patch deleted file mode 100644 index 576269c10..000000000 --- a/package/kernel/cryptodev-linux/patches/0003-move-recent-linux-version-ifdefs-from-v6.4-to-v6.5.patch +++ /dev/null @@ -1,56 +0,0 @@ -From bb8bc7cf60d2c0b097c8b3b0e807f805b577a53f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Joan=20Bruguera=20Mic=C3=B3?= -Date: Mon, 3 Jul 2023 00:46:02 +0000 -Subject: [PATCH] Move recent Linux version #ifdefs from v6.4 to v6.5 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The latest commits, meant to fix the build on Linux 6.4, are actually -fixing the build for API changes introduced in the merge window of the -yet-unreleased Linux 6.5, and actually break the build for Linux 6.4. - -In particular, the upstream commits introducing the API changes are the -following, which are *not* included in the Linux v6.4 tag: -* https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=19c4e618a1bc3d0cad1f04c857be8076cb05bbb2 -* https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ca5e863233e8f6acd1792fd85d6bc2729a1b2c10 - -Change to #ifdef's to v6.5, where they will most likely be included. - -Signed-off-by: Joan Bruguera Micó ---- - ioctl.c | 4 ++-- - zc.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - ---- a/ioctl.c -+++ b/ioctl.c -@@ -1246,7 +1246,7 @@ static struct ctl_table verbosity_ctl_ro - { - .procname = "ioctl", - .mode = 0555, --#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)) -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 5, 0)) - .child = verbosity_ctl_dir, - #endif - }, -@@ -1269,7 +1269,7 @@ static int __init init_cryptodev(void) - return rc; - } - --#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)) -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 5, 0)) - verbosity_sysctl_header = register_sysctl_table(verbosity_ctl_root); - #else - verbosity_sysctl_header = register_sysctl(verbosity_ctl_root->procname, verbosity_ctl_dir); ---- a/zc.c -+++ b/zc.c -@@ -80,7 +80,7 @@ int __get_userbuf(uint8_t __user *addr, - ret = get_user_pages_remote(task, mm, - (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0, - pg, NULL, NULL); --#elif (LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)) -+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(6, 5, 0)) - ret = get_user_pages_remote(mm, - (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0, - pg, NULL, NULL); diff --git a/package/kernel/cryptodev-linux/patches/0004-fix-build-for-linux-6.7-rc1.patch b/package/kernel/cryptodev-linux/patches/0004-fix-build-for-linux-6.7-rc1.patch deleted file mode 100644 index 4fded72fa..000000000 --- a/package/kernel/cryptodev-linux/patches/0004-fix-build-for-linux-6.7-rc1.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5e7121e45ff283d30097da381fd7e97c4bb61364 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Joan=20Bruguera=20Mic=C3=B3?= -Date: Sun, 10 Dec 2023 13:57:55 +0000 -Subject: [PATCH] Fix build for Linux 6.7-rc1 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Since Linux 6.7-rc1, no ahash algorithms set a nonzero alignmask, -and therefore `crypto_ahash_alignmask` has been removed. - -See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0f8660c82b79af595b056f6b9f4f227edeb88574 - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c626910f3f1bbce6ad18bc613d895d2a089ed95e - -Signed-off-by: Joan Bruguera Micó ---- - cryptlib.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/cryptlib.c -+++ b/cryptlib.c -@@ -381,7 +381,11 @@ int cryptodev_hash_init(struct hash_data - } - - hdata->digestsize = crypto_ahash_digestsize(hdata->async.s); -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 7, 0)) - hdata->alignmask = crypto_ahash_alignmask(hdata->async.s); -+#else -+ hdata->alignmask = 0; -+#endif - - init_completion(&hdata->async.result.completion); - diff --git a/package/kernel/cryptodev-linux/patches/0005-fix-build-for-linux-5.10.220+.patch b/package/kernel/cryptodev-linux/patches/0005-fix-build-for-linux-5.10.220+.patch deleted file mode 100644 index 3d2565317..000000000 --- a/package/kernel/cryptodev-linux/patches/0005-fix-build-for-linux-5.10.220+.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ioctl.c -+++ b/ioctl.c -@@ -933,7 +933,7 @@ - if (unlikely(ret)) { - #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) - sys_close(fd); --#elif (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)) -+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 220)) - ksys_close(fd); - #else - close_fd(fd);