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

Commit 7343b3b3 authored by H. Peter Anvin's avatar H. Peter Anvin Committed by Ingo Molnar
Browse files

x86: require family >= 6 if we are using P6 NOPs 



The P6 family of NOPs are only available on family >= 6 or above, so
enforce that in the boot code.

Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent a7ef94e6

arch/x86/Kconfig.cpu

+5 −0
Original line number Diff line number Diff line
@@ -377,6 +377,10 @@ config X86_OOSTORE 
	def_bool y

	depends on (MWINCHIP3D || MWINCHIP2 || MWINCHIPC6) && MTRR



config X86_P6_NOP

	def_bool y

	depends on (M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || PENTIUM4)



config X86_TSC

	def_bool y

	depends on ((MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2) && !X86_NUMAQ) || X86_64
@@ -390,6 +394,7 @@ config X86_CMOV 
config X86_MINIMUM_CPU_FAMILY

	int

	default "64" if X86_64

	default "6" if X86_32 && X86_P6_NOP

	default "4" if X86_32 && (X86_XADD || X86_CMPXCHG || X86_BSWAP || X86_WP_WORKS_OK)

	default "3"

include/asm-x86/nops.h

+1 −3
Original line number Diff line number Diff line
@@ -63,9 +63,7 @@ 
#define ASM_NOP6 K7_NOP6

#define ASM_NOP7 K7_NOP7

#define ASM_NOP8 K7_NOP8

#elif defined(CONFIG_M686) || defined(CONFIG_MPENTIUMII) || \

      defined(CONFIG_MPENTIUMIII) || defined(CONFIG_MPENTIUMM) || \

      defined(CONFIG_MCORE2) || defined(CONFIG_PENTIUM4)

#elif defined(CONFIG_X86_P6_NOP)

#define ASM_NOP1 P6_NOP1

#define ASM_NOP2 P6_NOP2

#define ASM_NOP3 P6_NOP3