Commit 984f8350 authored by Uros Bizjak's avatar Uros Bizjak Committed by Herbert Xu
Browse files

crypto: x86 - Remove CONFIG_AS_SHA1_NI 



Current minimum required version of binutils is 2.25,
which supports SHA-1 instruction mnemonics.

Remove check for assembler support of SHA-1 instructions
and all relevant macros for conditional compilation.

No functional change intended.

Signed-off-by: default avatarUros Bizjak <ubizjak@gmail.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Reviewed-by: default avatarEric Biggers <ebiggers@kernel.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent d0d9d00b

arch/x86/Kconfig.assembler

+0 −5
Original line number Diff line number Diff line
@@ -6,11 +6,6 @@ config AS_AVX512 
	help

	  Supported by binutils >= 2.25 and LLVM integrated assembler



config AS_SHA1_NI

	def_bool $(as-instr,sha1msg1 %xmm0$(comma)%xmm1)

	help

	  Supported by binutils >= 2.24 and LLVM integrated assembler



config AS_SHA256_NI

	def_bool $(as-instr,sha256msg1 %xmm0$(comma)%xmm1)

	help

arch/x86/crypto/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -56,8 +56,7 @@ aesni-intel-$(CONFIG_64BIT) += aes-gcm-avx10-x86_64.o 
endif



obj-$(CONFIG_CRYPTO_SHA1_SSSE3) += sha1-ssse3.o

sha1-ssse3-y := sha1_avx2_x86_64_asm.o sha1_ssse3_asm.o sha1_ssse3_glue.o

sha1-ssse3-$(CONFIG_AS_SHA1_NI) += sha1_ni_asm.o

sha1-ssse3-y := sha1_avx2_x86_64_asm.o sha1_ssse3_asm.o sha1_ni_asm.o sha1_ssse3_glue.o



obj-$(CONFIG_CRYPTO_SHA256_SSSE3) += sha256-ssse3.o

sha256-ssse3-y := sha256-ssse3-asm.o sha256-avx-asm.o sha256-avx2-asm.o sha256_ssse3_glue.o

arch/x86/crypto/sha1_ssse3_glue.c

+0 −10
Original line number Diff line number Diff line
@@ -28,9 +28,7 @@ 
#include <asm/simd.h>



static const struct x86_cpu_id module_cpu_ids[] = {

#ifdef CONFIG_AS_SHA1_NI

	X86_MATCH_FEATURE(X86_FEATURE_SHA_NI, NULL),

#endif

	X86_MATCH_FEATURE(X86_FEATURE_AVX2, NULL),

	X86_MATCH_FEATURE(X86_FEATURE_AVX, NULL),

	X86_MATCH_FEATURE(X86_FEATURE_SSSE3, NULL),
@@ -256,7 +254,6 @@ static void unregister_sha1_avx2(void) 
		crypto_unregister_shash(&sha1_avx2_alg);

}



#ifdef CONFIG_AS_SHA1_NI

asmlinkage void sha1_ni_transform(struct sha1_state *digest, const u8 *data,

				  int rounds);
@@ -306,11 +303,6 @@ static void unregister_sha1_ni(void) 
		crypto_unregister_shash(&sha1_ni_alg);

}



#else

static inline int register_sha1_ni(void) { return 0; }

static inline void unregister_sha1_ni(void) { }

#endif



static int __init sha1_ssse3_mod_init(void)

{

	if (!x86_match_cpu(module_cpu_ids))
@@ -360,6 +352,4 @@ MODULE_ALIAS_CRYPTO("sha1"); 
MODULE_ALIAS_CRYPTO("sha1-ssse3");

MODULE_ALIAS_CRYPTO("sha1-avx");

MODULE_ALIAS_CRYPTO("sha1-avx2");

#ifdef CONFIG_AS_SHA1_NI

MODULE_ALIAS_CRYPTO("sha1-ni");
 
#endif