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

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

x86/cpufeature: Replace cpu_has_avx 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-4-git-send-email-bp@alien8.de


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

arch/x86/crypto/aesni-intel_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -1477,7 +1477,7 @@ static int __init aesni_init(void) 
	}

	aesni_ctr_enc_tfm = aesni_ctr_enc;

#ifdef CONFIG_AS_AVX

	if (cpu_has_avx) {

	if (boot_cpu_has(X86_FEATURE_AVX)) {

		/* optimize performance of ctr mode encryption transform */

		aesni_ctr_enc_tfm = aesni_ctr_enc_avx_tfm;

		pr_info("AES CTR mode by8 optimization enabled\n");

arch/x86/crypto/camellia_aesni_avx2_glue.c

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

	const char *feature_name;



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

	if (!boot_cpu_has(X86_FEATURE_AVX) ||

	    !boot_cpu_has(X86_FEATURE_AVX2) ||

	    !boot_cpu_has(X86_FEATURE_AES) ||

	    !boot_cpu_has(X86_FEATURE_OSXSAVE)) {

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

arch/x86/crypto/camellia_aesni_avx_glue.c

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

	const char *feature_name;



	if (!cpu_has_avx ||

	if (!boot_cpu_has(X86_FEATURE_AVX) ||

	    !boot_cpu_has(X86_FEATURE_AES) ||

	    !boot_cpu_has(X86_FEATURE_OSXSAVE)) {

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

arch/x86/crypto/chacha20_glue.c

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



#ifdef CONFIG_AS_AVX2

	chacha20_use_avx2 = cpu_has_avx && boot_cpu_has(X86_FEATURE_AVX2) &&

	chacha20_use_avx2 = boot_cpu_has(X86_FEATURE_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

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



#ifdef CONFIG_AS_AVX2

	poly1305_use_avx2 = cpu_has_avx && boot_cpu_has(X86_FEATURE_AVX2) &&

	poly1305_use_avx2 = boot_cpu_has(X86_FEATURE_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)