All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v1] crypto: aesni - fix build on x86 (32bit)
@ 2013-12-30 13:52 Andy Shevchenko
  2013-12-31 11:57 ` Herbert Xu
  2014-01-06 17:41 ` Tim Chen
  0 siblings, 2 replies; 15+ messages in thread
From: Andy Shevchenko @ 2013-12-30 13:52 UTC (permalink / raw)
  To: linux-crypto, Herbert Xu, Tim Chen, Borislav Petkov, hpa; +Cc: Andy Shevchenko

It seems commit d764593a "crypto: aesni - AVX and AVX2 version of AESNI-GCM
encode and decode" breaks a build on x86_32 since it's designed only for
x86_64. This patch makes a compilation unit conditional to CONFIG_64BIT and
functions usage to CONFIG_X86_64.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 arch/x86/crypto/Makefile           | 3 ++-
 arch/x86/crypto/aesni-intel_glue.c | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile
index 84ee1e1..188b993 100644
--- a/arch/x86/crypto/Makefile
+++ b/arch/x86/crypto/Makefile
@@ -75,7 +75,8 @@ ifeq ($(avx2_supported),yes)
 	serpent-avx2-y := serpent-avx2-asm_64.o serpent_avx2_glue.o
 endif
 
-aesni-intel-y := aesni-intel_asm.o aesni-intel_avx.o aesni-intel_glue.o fpu.o
+aesni-intel-y := aesni-intel_asm.o aesni-intel_glue.o fpu.o
+aesni-intel-$(CONFIG_64BIT) += aesni-intel_avx.o
 ghash-clmulni-intel-y := ghash-clmulni-intel_asm.o ghash-clmulni-intel_glue.o
 sha1-ssse3-y := sha1_ssse3_asm.o sha1_ssse3_glue.o
 crc32c-intel-y := crc32c-intel_glue.o
diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
index 3ae311d..948ad0e 100644
--- a/arch/x86/crypto/aesni-intel_glue.c
+++ b/arch/x86/crypto/aesni-intel_glue.c
@@ -1473,6 +1473,7 @@ static int __init aesni_init(void)
 
 	if (!x86_match_cpu(aesni_cpu_id))
 		return -ENODEV;
+#ifdef CONFIG_X86_64
 #ifdef CONFIG_AS_AVX2
 	if (boot_cpu_has(X86_FEATURE_AVX2)) {
 		pr_info("AVX2 version of gcm_enc/dec engaged.\n");
@@ -1492,6 +1493,7 @@ static int __init aesni_init(void)
 		aesni_gcm_enc_tfm = aesni_gcm_enc;
 		aesni_gcm_dec_tfm = aesni_gcm_dec;
 	}
+#endif
 
 	err = crypto_fpu_init();
 	if (err)
-- 
1.8.5.2

^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2014-01-15  3:44 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-30 13:52 [PATCH v1] crypto: aesni - fix build on x86 (32bit) Andy Shevchenko
2013-12-31 11:57 ` Herbert Xu
2014-01-06 17:41 ` Tim Chen
2014-01-06 17:45   ` H. Peter Anvin
2014-01-06 17:57     ` Tim Chen
2014-01-06 18:00       ` H. Peter Anvin
2014-01-06 18:10         ` Tim Chen
2014-01-06 20:26           ` Borislav Petkov
2014-01-06 21:21             ` H. Peter Anvin
2014-01-06 23:39               ` Tim Chen
2014-01-06 23:41                 ` H. Peter Anvin
2014-01-07  1:30                   ` Herbert Xu
2014-01-09  9:03                 ` Herbert Xu
2014-01-09 16:57                   ` Tim Chen
2014-01-15  3:43                     ` Herbert Xu

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.