2018-05-18 23:01 GMT+02:00 Ondrej Mosnáček <omosnacek@xxxxxxxxx>:
> From: Ondrej Mosnacek <omosnacek@xxxxxxxxx>
>
> Commit 56e8e57fc3a7 ("crypto: morus - Add common SIMD glue code for
> MORUS") accidetally consiedered the glue code to be usable by different
> architectures, but it seems to be only usable on x86.
>
> This patch moves it under arch/x86/crypto and adds 'depends on X86' to
> the Kconfig options.
>
> Reported-by: kbuild test robot <lkp@xxxxxxxxx>
> Signed-off-by: Ondrej Mosnacek <omosnacek@xxxxxxxxx>
> ---
> arch/x86/crypto/Makefile | 3 +++
> {crypto => arch/x86/crypto}/morus1280_glue.c | 4 ++--
> {crypto => arch/x86/crypto}/morus640_glue.c | 4 ++--
> crypto/Kconfig | 6 ++++--
> crypto/Makefile | 2 --
> 5 files changed, 11 insertions(+), 8 deletions(-)
> rename {crypto => arch/x86/crypto}/morus1280_glue.c (98%)
> rename {crypto => arch/x86/crypto}/morus640_glue.c (98%)
>
> diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile
> index 3813e7cdaada..48e731d782e9 100644
> --- a/arch/x86/crypto/Makefile
> +++ b/arch/x86/crypto/Makefile
> @@ -42,6 +42,9 @@ obj-$(CONFIG_CRYPTO_AEGIS128_AESNI_SSE2) += aegis128-aesni.o
> obj-$(CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2) += aegis128l-aesni.o
> obj-$(CONFIG_CRYPTO_AEGIS256_AESNI_SSE2) += aegis256-aesni.o
>
> +obj-$(CONFIG_CRYPTO_MORUS640_GLUE) += morus640_glue.o
> +obj-$(CONFIG_CRYPTO_MORUS1280_GLUE) += morus1280_glue.o
> +
> obj-$(CONFIG_CRYPTO_MORUS640_SSE2) += morus640-sse2.o
> obj-$(CONFIG_CRYPTO_MORUS1280_SSE2) += morus1280-sse2.o
>
> diff --git a/crypto/morus1280_glue.c b/arch/x86/crypto/morus1280_glue.c
> similarity index 98%
> rename from crypto/morus1280_glue.c
> rename to arch/x86/crypto/morus1280_glue.c
> index ce1e5c34b09d..0dccdda1eb3a 100644
> --- a/crypto/morus1280_glue.c
> +++ b/arch/x86/crypto/morus1280_glue.c
> @@ -1,6 +1,6 @@
> /*
> * The MORUS-1280 Authenticated-Encryption Algorithm
> - * Common glue skeleton
> + * Common x86 SIMD glue skeleton
> *
> * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@xxxxxxxxx>
> * Copyright (C) 2017-2018 Red Hat, Inc. All rights reserved.
> @@ -299,4 +299,4 @@ EXPORT_SYMBOL_GPL(cryptd_morus1280_glue_exit_tfm);
>
> MODULE_LICENSE("GPL");
> MODULE_AUTHOR("Ondrej Mosnacek <omosnacek@xxxxxxxxx>");
> -MODULE_DESCRIPTION("MORUS-1280 AEAD mode -- glue for optimizations");
> +MODULE_DESCRIPTION("MORUS-1280 AEAD mode -- glue for x86 optimizations");
> diff --git a/crypto/morus640_glue.c b/arch/x86/crypto/morus640_glue.c
> similarity index 98%
> rename from crypto/morus640_glue.c
> rename to arch/x86/crypto/morus640_glue.c
> index c7e788cfaa29..7b58fe4d9bd1 100644
> --- a/crypto/morus640_glue.c
> +++ b/arch/x86/crypto/morus640_glue.c
> @@ -1,6 +1,6 @@
> /*
> * The MORUS-640 Authenticated-Encryption Algorithm
> - * Common glue skeleton
> + * Common x86 SIMD glue skeleton
> *
> * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@xxxxxxxxx>
> * Copyright (C) 2017-2018 Red Hat, Inc. All rights reserved.
> @@ -295,4 +295,4 @@ EXPORT_SYMBOL_GPL(cryptd_morus640_glue_exit_tfm);
>
> MODULE_LICENSE("GPL");
> MODULE_AUTHOR("Ondrej Mosnacek <omosnacek@xxxxxxxxx>");
> -MODULE_DESCRIPTION("MORUS-640 AEAD mode -- glue for optimizations");
> +MODULE_DESCRIPTION("MORUS-640 AEAD mode -- glue for x86 optimizations");
> diff --git a/crypto/Kconfig b/crypto/Kconfig
> index 75f5efde9aa3..0c9883d60a51 100644
> --- a/crypto/Kconfig
> +++ b/crypto/Kconfig
> @@ -341,7 +341,8 @@ config CRYPTO_MORUS640
> Support for the MORUS-640 dedicated AEAD algorithm.
>
> config CRYPTO_MORUS640_GLUE
> - tristate "MORUS-640 AEAD algorithm (glue for SIMD optimizations)"
> + tristate "MORUS-640 AEAD algorithm (glue for x86 SIMD optimizations)"
> + depends on X86
> select CRYPTO_AEAD
> select CRYPTO_CRYPTD
> help
> @@ -363,7 +364,8 @@ config CRYPTO_MORUS1280
> Support for the MORUS-1280 dedicated AEAD algorithm.
>
> config CRYPTO_MORUS1280_GLUE
> - tristate "MORUS-1280 AEAD algorithm (glue for SIMD optimizations)"
> + tristate "MORUS-1280 AEAD algorithm (glue for x86 SIMD optimizations)"
> + depends on X86
> select CRYPTO_AEAD
> select CRYPTO_CRYPTD
> help
I realized these options shouldn't be shown to the user and thus
should have no prompt text set. I will send a v2 that also removes the
prompts.
Regards,
Ondrej
> diff --git a/crypto/Makefile b/crypto/Makefile
> index 68a7c546460a..6d1d40eeb964 100644
> --- a/crypto/Makefile
> +++ b/crypto/Makefile
> @@ -91,8 +91,6 @@ obj-$(CONFIG_CRYPTO_AEGIS128L) += aegis128l.o
> obj-$(CONFIG_CRYPTO_AEGIS256) += aegis256.o
> obj-$(CONFIG_CRYPTO_MORUS640) += morus640.o
> obj-$(CONFIG_CRYPTO_MORUS1280) += morus1280.o
> -obj-$(CONFIG_CRYPTO_MORUS640_GLUE) += morus640_glue.o
> -obj-$(CONFIG_CRYPTO_MORUS1280_GLUE) += morus1280_glue.o
> obj-$(CONFIG_CRYPTO_PCRYPT) += pcrypt.o
> obj-$(CONFIG_CRYPTO_CRYPTD) += cryptd.o
> obj-$(CONFIG_CRYPTO_MCRYPTD) += mcryptd.o
> --
> 2.17.0
>
