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

Commit 1f9c52e1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 cpu feature fixes from Ingo Molnar:
 "Two small cpufeature support updates"

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Fix override new_cpu_data.x86 with 486
  x86, cpufeature: Use new CC_HAVE_ASM_GOTO
parents 9cb87aaf 237d1548

arch/x86/include/asm/cpufeature.h

+11 −6
Original line number Diff line number Diff line
@@ -366,9 +366,10 @@ extern bool __static_cpu_has_safe(u16 bit); 
 */

static __always_inline __pure bool __static_cpu_has(u16 bit)

{

#if __GNUC__ > 4 || __GNUC_MINOR__ >= 5

#ifdef CC_HAVE_ASM_GOTO



#ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS



		/*

		 * Catch too early usage of this before alternatives

		 * have run.
@@ -384,6 +385,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit) 
			 ".previous\n"

			 /* skipping size check since replacement size = 0 */

			 : : "i" (X86_FEATURE_ALWAYS) : : t_warn);



#endif



		asm goto("1: jmp %l[t_no]\n"
@@ -406,7 +408,9 @@ static __always_inline __pure bool __static_cpu_has(u16 bit) 
		warn_pre_alternatives();

		return false;

#endif

#else /* GCC_VERSION >= 40500 */



#else /* CC_HAVE_ASM_GOTO */



		u8 flag;

		/* Open-coded due to __stringify() in ALTERNATIVE() */

		asm volatile("1: movb $0,%0\n"
@@ -427,7 +431,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit) 
			     ".previous\n"

			     : "=qm" (flag) : "i" (bit));

		return flag;

#endif



#endif /* CC_HAVE_ASM_GOTO */

}



#define static_cpu_has(bit)					\
@@ -441,7 +446,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit) 


static __always_inline __pure bool _static_cpu_has_safe(u16 bit)

{

#if __GNUC__ > 4 || __GNUC_MINOR__ >= 5

#ifdef CC_HAVE_ASM_GOTO

/*

 * We need to spell the jumps to the compiler because, depending on the offset,

 * the replacement jump can be bigger than the original jump, and this we cannot
@@ -475,7 +480,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit) 
		return false;

	t_dynamic:

		return __static_cpu_has_safe(bit);

#else /* GCC_VERSION >= 40500 */

#else

		u8 flag;

		/* Open-coded due to __stringify() in ALTERNATIVE() */

		asm volatile("1: movb $2,%0\n"
@@ -511,7 +516,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit) 
			     : "=qm" (flag)

			     : "i" (bit), "i" (X86_FEATURE_ALWAYS));

		return (flag == 2 ? __static_cpu_has_safe(bit) : flag);

#endif

#endif /* CC_HAVE_ASM_GOTO */

}



#define static_cpu_has_safe(bit)				\

arch/x86/kernel/head_32.S

+1 −1
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ enable_paging: 
/*

 * Check if it is 486

 */

	movb $4,X86			# at least 486

	cmpl $-1,X86_CPUID

	je is486
@@ -436,7 +437,6 @@ enable_paging: 
	movl %edx,X86_CAPABILITY



is486:

	movb $4,X86

	movl $0x50022,%ecx	# set AM, WP, NE and MP

	movl %cr0,%eax

	andl $0x80000011,%eax	# Save PG,PE,ET