openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

crypto: morus - Mark MORUS SIMD glue as x86-specific 

Commit 56e8e57fc3 ("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 and also removes the prompt to hide these internal
options from the user.

Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Ondrej Mosnacek <omosnacek@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Ondrej Mosnacek 2018-05-21 21:41:51 +02:00 committed by Herbert Xu
parent 92a4c9fef3
commit 2808f17319
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/crypto/Makefile
View File

@ -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_AEGIS128L_AESNI_SSE2) += aegis128l-aesni.o
obj-$(CONFIG_CRYPTO_AEGIS256_AESNI_SSE2) += aegis256-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_MORUS640_SSE2) += morus640-sse2.o
obj-$(CONFIG_CRYPTO_MORUS1280_SSE2) += morus1280-sse2.o obj-$(CONFIG_CRYPTO_MORUS1280_SSE2) += morus1280-sse2.o

4
crypto/morus1280_glue.c → arch/x86/crypto/morus1280_glue.c
View File

@ -1,6 +1,6 @@
/* /*
* The MORUS-1280 Authenticated-Encryption Algorithm * The MORUS-1280 Authenticated-Encryption Algorithm
* Common glue skeleton * Common x86 SIMD glue skeleton
* *
* Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com> * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com>
* Copyright (C) 2017-2018 Red Hat, Inc. All rights reserved. * 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_LICENSE("GPL");
MODULE_AUTHOR("Ondrej Mosnacek <omosnacek@gmail.com>"); MODULE_AUTHOR("Ondrej Mosnacek <omosnacek@gmail.com>");
MODULE_DESCRIPTION("MORUS-1280 AEAD mode -- glue for optimizations"); MODULE_DESCRIPTION("MORUS-1280 AEAD mode -- glue for x86 optimizations");

4
crypto/morus640_glue.c → arch/x86/crypto/morus640_glue.c
View File

@ -1,6 +1,6 @@
/* /*
* The MORUS-640 Authenticated-Encryption Algorithm * The MORUS-640 Authenticated-Encryption Algorithm
* Common glue skeleton * Common x86 SIMD glue skeleton
* *
* Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com> * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com>
* Copyright (C) 2017-2018 Red Hat, Inc. All rights reserved. * 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_LICENSE("GPL");
MODULE_AUTHOR("Ondrej Mosnacek <omosnacek@gmail.com>"); MODULE_AUTHOR("Ondrej Mosnacek <omosnacek@gmail.com>");
MODULE_DESCRIPTION("MORUS-640 AEAD mode -- glue for optimizations"); MODULE_DESCRIPTION("MORUS-640 AEAD mode -- glue for x86 optimizations");

6
crypto/Kconfig
View File

@ -341,7 +341,8 @@ config CRYPTO_MORUS640
Support for the MORUS-640 dedicated AEAD algorithm. Support for the MORUS-640 dedicated AEAD algorithm.
config CRYPTO_MORUS640_GLUE config CRYPTO_MORUS640_GLUE
tristate "MORUS-640 AEAD algorithm (glue for SIMD optimizations)" tristate
depends on X86
select CRYPTO_AEAD select CRYPTO_AEAD
select CRYPTO_CRYPTD select CRYPTO_CRYPTD
help help
@ -363,7 +364,8 @@ config CRYPTO_MORUS1280
Support for the MORUS-1280 dedicated AEAD algorithm. Support for the MORUS-1280 dedicated AEAD algorithm.
config CRYPTO_MORUS1280_GLUE config CRYPTO_MORUS1280_GLUE
tristate "MORUS-1280 AEAD algorithm (glue for SIMD optimizations)" tristate
depends on X86
select CRYPTO_AEAD select CRYPTO_AEAD
select CRYPTO_CRYPTD select CRYPTO_CRYPTD
help help

2
crypto/Makefile
View File

@ -91,8 +91,6 @@ obj-$(CONFIG_CRYPTO_AEGIS128L) += aegis128l.o
obj-$(CONFIG_CRYPTO_AEGIS256) += aegis256.o obj-$(CONFIG_CRYPTO_AEGIS256) += aegis256.o
obj-$(CONFIG_CRYPTO_MORUS640) += morus640.o obj-$(CONFIG_CRYPTO_MORUS640) += morus640.o
obj-$(CONFIG_CRYPTO_MORUS1280) += morus1280.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_PCRYPT) += pcrypt.o
obj-$(CONFIG_CRYPTO_CRYPTD) += cryptd.o obj-$(CONFIG_CRYPTO_CRYPTD) += cryptd.o
obj-$(CONFIG_CRYPTO_MCRYPTD) += mcryptd.o obj-$(CONFIG_CRYPTO_MCRYPTD) += mcryptd.o