Fixes various compilation issues with kernel >= 5.5 and >=5.8. All patches are applied upstream.
Signed-off-by: Bastian Krause <[email protected]> --- Changes since (implicit) v1: - removed leftover patches as these are applied upstream --- ...x-module-loading-with-Linux-v5.0-rc5.patch | 49 ------------------- ...-cryptlib.c-fix-build-on-kernel-v5.5.patch | 39 --------------- patches/cryptodev-linux-1.10/series | 5 -- rules/cryptodev.make | 4 +- 4 files changed, 2 insertions(+), 95 deletions(-) delete mode 100644 patches/cryptodev-linux-1.10/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch delete mode 100644 patches/cryptodev-linux-1.10/0002-cryptlib.c-fix-build-on-kernel-v5.5.patch delete mode 100644 patches/cryptodev-linux-1.10/series diff --git a/patches/cryptodev-linux-1.10/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch b/patches/cryptodev-linux-1.10/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch deleted file mode 100644 index 966c99995..000000000 --- a/patches/cryptodev-linux-1.10/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: "Derald D. Woods" <[email protected]> -Date: Sun, 10 Feb 2019 13:22:19 -0600 -Subject: [PATCH] Fix module loading with Linux v5.0-rc5 - -This commit fixes this module load error: -[...] -[ 29.112091] cryptodev: loading out-of-tree module taints kernel. -[ 29.128906] cryptodev: Unknown symbol crypto_givcipher_type (err -2) -[ 29.188842] cryptodev: Unknown symbol crypto_givcipher_type (err -2) -modprobe: can't load module cryptodev (extra/cryptodev.ko): unknown symbol in module, or unknown parameter -[...] - -Upstream Linux support for unused GIVCIPHER, and others, was dropped here: - -c79b411eaa72 (crypto: skcipher - remove remnants of internal IV generators) - -Signed-off-by: Derald D. Woods <[email protected]> ---- - cryptlib.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/cryptlib.c b/cryptlib.c -index 6e66698f78ed..4a8703788eb8 100644 ---- a/cryptlib.c -+++ b/cryptlib.c -@@ -38,7 +38,9 @@ - #include "cryptodev_int.h" - #include "cipherapi.h" - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)) - extern const struct crypto_type crypto_givcipher_type; -+#endif - - static void cryptodev_complete(struct crypto_async_request *req, int err) - { -@@ -157,8 +159,11 @@ int cryptodev_cipher_init(struct cipher_data *out, const char *alg_name, - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)) - tfm = crypto_skcipher_tfm(out->async.s); -- if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) || -- (tfm->__crt_alg->cra_type == &crypto_givcipher_type)) { -+ if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)) -+ || (tfm->__crt_alg->cra_type == &crypto_givcipher_type) -+#endif -+ ) { - struct ablkcipher_alg *alg; - - alg = &tfm->__crt_alg->cra_ablkcipher; diff --git a/patches/cryptodev-linux-1.10/0002-cryptlib.c-fix-build-on-kernel-v5.5.patch b/patches/cryptodev-linux-1.10/0002-cryptlib.c-fix-build-on-kernel-v5.5.patch deleted file mode 100644 index b7067114f..000000000 --- a/patches/cryptodev-linux-1.10/0002-cryptlib.c-fix-build-on-kernel-v5.5.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Andrei Botila <[email protected]> -Date: Wed, 27 Nov 2019 09:53:37 +0200 -Subject: [PATCH] cryptlib.c: fix build on kernel v5.5+ - -Starting with kernel v5.5-rc1 ablkcipher and blkcipher are removed and -symmetric key operations will rely solely on skcipher: -commit d63007eb954 ("crypto: ablkcipher - remove deprecated and unused ablkcipher support"). - -When cryptodev will use higher kernel versions > 5.4 will need to use the -skcipher interface instead. - -Signed-off-by: Andrei Botila <[email protected]> ---- - cryptlib.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/cryptlib.c b/cryptlib.c -index 4a8703788eb8..e2a4198adb75 100644 ---- a/cryptlib.c -+++ b/cryptlib.c -@@ -159,6 +159,7 @@ int cryptodev_cipher_init(struct cipher_data *out, const char *alg_name, - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)) - tfm = crypto_skcipher_tfm(out->async.s); -+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(5, 4, 0)) - if ((tfm->__crt_alg->cra_type == &crypto_ablkcipher_type) - #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)) - || (tfm->__crt_alg->cra_type == &crypto_givcipher_type) -@@ -169,7 +170,9 @@ int cryptodev_cipher_init(struct cipher_data *out, const char *alg_name, - alg = &tfm->__crt_alg->cra_ablkcipher; - min_keysize = alg->min_keysize; - max_keysize = alg->max_keysize; -- } else { -+ } else -+#endif -+ { - struct skcipher_alg *alg; - - alg = crypto_skcipher_alg(out->async.s); diff --git a/patches/cryptodev-linux-1.10/series b/patches/cryptodev-linux-1.10/series deleted file mode 100644 index a7ecb577b..000000000 --- a/patches/cryptodev-linux-1.10/series +++ /dev/null @@ -1,5 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-Fix-module-loading-with-Linux-v5.0-rc5.patch -0002-cryptlib.c-fix-build-on-kernel-v5.5.patch -# 1ca74adf7b33d422b42c72283808745c - git-ptx-patches magic diff --git a/rules/cryptodev.make b/rules/cryptodev.make index 3d82e95c5..42ac15f3c 100644 --- a/rules/cryptodev.make +++ b/rules/cryptodev.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_CRYPTODEV) += cryptodev # # Paths and names and versions # -CRYPTODEV_VERSION := 1.10 -CRYPTODEV_MD5 := 53403fbb99cd88a48bc899dbe9158e1c +CRYPTODEV_VERSION := 1.11 +CRYPTODEV_MD5 := 9ea9c7d7b6865e7752e6055a5d082825 CRYPTODEV := cryptodev-linux-$(CRYPTODEV_VERSION) CRYPTODEV_SUFFIX := tar.gz CRYPTODEV_URL := \ -- 2.28.0 _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
