[PATCH] lib/crypto: x86/blake2s: Drop redundant checks for AVX and AVX512F

[PATCH] lib/crypto: x86/blake2s: Drop redundant checks for AVX and AVX512F

[Eric Biggers]

X86_FEATURE_AVX2 implies X86_FEATURE_AVX.  Similarly,
X86_FEATURE_AVX512VL implies X86_FEATURE_AVX512F (and X86_FEATURE_AVX).

Simplify blake2s_mod_init_arch() accordingly.  Also nest these checks
under the block that sets the static key for blake2s_use_ssse3,
mirroring the code that uses these static keys.

(Note: as usual, arch/x86/kernel/cpu/cpuid-deps.c is non-enforcing: if a
dependency isn't met, it warns and doesn't prevent booting.  However,
that case doesn't occur in real CPUs and is unsupported.)

Signed-off-by: Eric Biggers <ebiggers@kernel.org>
---
 lib/crypto/x86/blake2s.h | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/crypto/x86/blake2s.h b/lib/crypto/x86/blake2s.h
index 952db559eed34..e504279a2fa38 100644
--- a/lib/crypto/x86/blake2s.h
+++ b/lib/crypto/x86/blake2s.h
@@ -49,12 +49,10 @@ static void blake2s_compress(struct blake2s_ctx *ctx,
 #define blake2s_mod_init_arch blake2s_mod_init_arch
 static void blake2s_mod_init_arch(void)
 {
-	if (boot_cpu_has(X86_FEATURE_SSSE3))
+	if (boot_cpu_has(X86_FEATURE_SSSE3)) {
 		static_branch_enable(&blake2s_use_ssse3);
-
-	if (boot_cpu_has(X86_FEATURE_AVX) &&
-	    boot_cpu_has(X86_FEATURE_AVX2) &&
-	    boot_cpu_has(X86_FEATURE_AVX512F) &&
-	    boot_cpu_has(X86_FEATURE_AVX512VL))
-		static_branch_enable(&blake2s_use_avx512);
+		if (boot_cpu_has(X86_FEATURE_AVX2) &&
+		    boot_cpu_has(X86_FEATURE_AVX512VL))
+			static_branch_enable(&blake2s_use_avx512);
+	}
 }

base-commit: 33b4f31b1aea3f62b61c892daefc0e6a77859032
-- 
2.56.1