[OE-core] [PATCH] cryptodev: update to Jan.23, 2020

[Scott Branden]

Hi,

cryptodev and perf don't build with the latest 5.5+ kernel in yocto.

Just wondering if I need to do anything else I need to do for this patch 
to be accepted?
Also, I see perf patches in the mailing list and was wondering if there 
were ready to try as well?


On 2020-02-06 12:57 p.m., Scott Branden wrote:
> * Remove backported patches:
>    0001-Fix-module-loading-with-Linux-v5.0-rc5.patch
>
> Update to latest cryptodev dated Jan.23, 2020.
> Fixes build on kernel v5.5+
>
> Signed-off-by: Scott Branden <scott.branden at broadcom.com>
> ---
>   meta/recipes-kernel/cryptodev/cryptodev.inc   |  3 +-
>   ...x-module-loading-with-Linux-v5.0-rc5.patch | 59 -------------------
>   2 files changed, 1 insertion(+), 61 deletions(-)
>   delete mode 100644 meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch
>
> diff --git a/meta/recipes-kernel/cryptodev/cryptodev.inc b/meta/recipes-kernel/cryptodev/cryptodev.inc
> index 9d8ba44058..f99f8bc9f0 100644
> --- a/meta/recipes-kernel/cryptodev/cryptodev.inc
> +++ b/meta/recipes-kernel/cryptodev/cryptodev.inc
> @@ -4,9 +4,8 @@ LICENSE = "GPLv2"
>   LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
>   
>   SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux \
> -           file://0001-Fix-module-loading-with-Linux-v5.0-rc5.patch \
>              "
> -SRCREV = "fd8b15ef1c8398a69a37932ee48c74ab40329a29"
> +SRCREV = "a87053bee5680878c295b7d23cf0d7065576ac2b"
>   
>   S = "${WORKDIR}/git"
>   
> diff --git a/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch b/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch
> deleted file mode 100644
> index 34ec87272f..0000000000
> --- a/meta/recipes-kernel/cryptodev/files/0001-Fix-module-loading-with-Linux-v5.0-rc5.patch
> +++ /dev/null
> @@ -1,59 +0,0 @@
> -Upstream-Status: Backport [https://github.com/cryptodev-linux/cryptodev-linux/commit/f971e0c]
> -
> -Backport patch from upstream to fix module cryptodev loading error.
> -
> -Signed-off-by: Kai Kang <kai.kang at windriver.com>
> -
> -From f971e0cd4a0ebe59fb2e8e17240399bf6901b09b Mon Sep 17 00:00:00 2001
> -From: "Derald D. Woods" <woods.technical at gmail.com>
> -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 <woods.technical at gmail.com>
> ----
> - cryptlib.c | 9 +++++++--
> - 1 file changed, 7 insertions(+), 2 deletions(-)
> -
> -diff --git a/cryptlib.c b/cryptlib.c
> -index 6e66698..4a87037 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;
> ---
> -2.20.0
> -