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

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

x86/cpufeature: Remove cpu_has_osxsave 



Use boot_cpu_has() instead.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
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/1459266123-21878-4-git-send-email-bp@alien8.de


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

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 (!cpu_has_avx2 || !cpu_has_avx || !cpu_has_aes || !cpu_has_osxsave) {

	if (!cpu_has_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/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 || !cpu_has_aes || !cpu_has_osxsave) {

	if (!cpu_has_avx || !cpu_has_aes || !boot_cpu_has(X86_FEATURE_OSXSAVE)) {

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

		return -ENODEV;

	}

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 || !cpu_has_osxsave) {

	if (!cpu_has_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
@@ -135,7 +135,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; 
#define cpu_has_x2apic		boot_cpu_has(X86_FEATURE_X2APIC)

#define cpu_has_xsave		boot_cpu_has(X86_FEATURE_XSAVE)

#define cpu_has_xsaves		boot_cpu_has(X86_FEATURE_XSAVES)

#define cpu_has_osxsave		boot_cpu_has(X86_FEATURE_OSXSAVE)

/*

 * Do not add any more of those clumsy macros - use static_cpu_has() for

 * fast paths and boot_cpu_has() otherwise!

arch/x86/include/asm/xor_avx.h

+2 −2
Original line number Diff line number Diff line
@@ -167,12 +167,12 @@ static struct xor_block_template xor_block_avx = { 


#define AVX_XOR_SPEED \

do { \

	if (cpu_has_avx && cpu_has_osxsave) \

	if (cpu_has_avx && boot_cpu_has(X86_FEATURE_OSXSAVE)) \

		xor_speed(&xor_block_avx); \

} while (0)



#define AVX_SELECT(FASTEST) \

	(cpu_has_avx && cpu_has_osxsave ? &xor_block_avx : FASTEST)

	(cpu_has_avx && boot_cpu_has(X86_FEATURE_OSXSAVE) ? &xor_block_avx : FASTEST)



#else