Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abcfdfe0 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/cpufeature: Replace cpu_has_avx2 with boot_cpu_has() usage 



Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-crypto@vger.kernel.org
Link: http://lkml.kernel.org/r/1459801503-15600-2-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 95a8e746

arch/x86/crypto/camellia_aesni_avx2_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ static int __init camellia_aesni_init(void) 
{

	const char *feature_name;



	if (!cpu_has_avx2 || !cpu_has_avx || !cpu_has_aes ||

	if (!boot_cpu_has(X86_FEATURE_AVX2) || !cpu_has_avx || !cpu_has_aes ||

	    !boot_cpu_has(X86_FEATURE_OSXSAVE)) {

		pr_info("AVX2 or AES-NI instructions are not detected.\n");

		return -ENODEV;

arch/x86/crypto/chacha20_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static int __init chacha20_simd_mod_init(void) 
		return -ENODEV;



#ifdef CONFIG_AS_AVX2

	chacha20_use_avx2 = cpu_has_avx && cpu_has_avx2 &&

	chacha20_use_avx2 = cpu_has_avx && boot_cpu_has(X86_FEATURE_AVX2) &&

			    cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM, NULL);

#endif

	return crypto_register_alg(&alg);

arch/x86/crypto/poly1305_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static int __init poly1305_simd_mod_init(void) 
		return -ENODEV;



#ifdef CONFIG_AS_AVX2

	poly1305_use_avx2 = cpu_has_avx && cpu_has_avx2 &&

	poly1305_use_avx2 = cpu_has_avx && boot_cpu_has(X86_FEATURE_AVX2) &&

			    cpu_has_xfeatures(XFEATURE_MASK_SSE | XFEATURE_MASK_YMM, NULL);

	alg.descsize = sizeof(struct poly1305_simd_desc_ctx);

	if (poly1305_use_avx2)

arch/x86/crypto/serpent_avx2_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ static int __init init(void) 
{

	const char *feature_name;



	if (!cpu_has_avx2 || !boot_cpu_has(X86_FEATURE_OSXSAVE)) {

	if (!boot_cpu_has(X86_FEATURE_AVX2) || !boot_cpu_has(X86_FEATURE_OSXSAVE)) {

		pr_info("AVX2 instructions are not detected.\n");

		return -ENODEV;

	}

arch/x86/include/asm/cpufeature.h

+0 −1
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; 
#define cpu_has_xmm		boot_cpu_has(X86_FEATURE_XMM)

#define cpu_has_aes		boot_cpu_has(X86_FEATURE_AES)

#define cpu_has_avx		boot_cpu_has(X86_FEATURE_AVX)

#define cpu_has_avx2		boot_cpu_has(X86_FEATURE_AVX2)

#define cpu_has_xsave		boot_cpu_has(X86_FEATURE_XSAVE)

#define cpu_has_xsaves		boot_cpu_has(X86_FEATURE_XSAVES)

/*