[PATCH] lib/crypto: x86/chacha: Drop redundant check for AVX

[PATCH] lib/crypto: x86/chacha: Drop redundant check for AVX

[Eric Biggers]

X86_FEATURE_AVX2 implies X86_FEATURE_AVX.  Simplify
chacha_mod_init_arch() accordingly.

(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/chacha.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/crypto/x86/chacha.h b/lib/crypto/x86/chacha.h
index 76cddc522fa04..3e465184ca87b 100644
--- a/lib/crypto/x86/chacha.h
+++ b/lib/crypto/x86/chacha.h
@@ -188,8 +188,7 @@ static void chacha_mod_init_arch(void)
 
 	static_branch_enable(&chacha_use_simd);
 
-	if (boot_cpu_has(X86_FEATURE_AVX) &&
-	    boot_cpu_has(X86_FEATURE_AVX2)) {
+	if (boot_cpu_has(X86_FEATURE_AVX2)) {
 		static_branch_enable(&chacha_use_avx2);
 
 		if (boot_cpu_has(X86_FEATURE_AVX512VL) &&

base-commit: 33b4f31b1aea3f62b61c892daefc0e6a77859032
-- 
2.56.1