Commit ba5a434d authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: x86/sha256 - autoload if SHA-NI detected 



The x86 SHA-256 module contains four implementations: SSSE3, AVX, AVX2,
and SHA-NI.  Commit 1c43c0f1 ("crypto: x86/sha - load modules based
on CPU features") made the module be autoloaded when SSSE3, AVX, or AVX2
is detected.  The omission of SHA-NI appears to be an oversight, perhaps
because of the outdated file-level comment.  This patch fixes this,
though in practice this makes no difference because SSSE3 is a subset of
the other three features anyway.  Indeed, sha256_ni_transform() executes
SSSE3 instructions such as pshufb.

Reviewed-by: default avatarRoxana Nicolescu <roxana.nicolescu@canonical.com>
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 20342e3f

arch/x86/crypto/sha256_ssse3_glue.c

+5 −2
Original line number Diff line number Diff line 
/*

 * Cryptographic API.

 *

 * Glue code for the SHA256 Secure Hash Algorithm assembler

 * implementation using supplemental SSE3 / AVX / AVX2 instructions.

 * Glue code for the SHA256 Secure Hash Algorithm assembler implementations

 * using SSSE3, AVX, AVX2, and SHA-NI instructions.

 *

 * This file is based on sha256_generic.c

 *
@@ -45,6 +45,9 @@ asmlinkage void sha256_transform_ssse3(struct sha256_state *state, 
				       const u8 *data, int blocks);



static const struct x86_cpu_id module_cpu_ids[] = {

#ifdef CONFIG_AS_SHA256_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),