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

Commit 6e17cb9c authored by Dave Hansen's avatar Dave Hansen Committed by Ingo Molnar
Browse files

x86/cpufeature: Update cpufeaure macros 



We had a new CPUID "NCAPINT" word added, but the REQUIRED_MASK and
DISABLED_MASK macros did not get updated.  Update them.

None of the features was needed in these masks, so there was no
harm, but we should keep them updated anyway.

Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Hansen <dave@sr71.net>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20160629200107.8D3C9A31@viggo.jf.intel.com


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

arch/x86/include/asm/cpufeature.h

+4 −2
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; 
	   (((bit)>>5)==13 && (1UL<<((bit)&31) & REQUIRED_MASK13)) ||	\

	   (((bit)>>5)==14 && (1UL<<((bit)&31) & REQUIRED_MASK14)) ||	\

	   (((bit)>>5)==15 && (1UL<<((bit)&31) & REQUIRED_MASK15)) ||	\

	   (((bit)>>5)==16 && (1UL<<((bit)&31) & REQUIRED_MASK16)) )

	   (((bit)>>5)==16 && (1UL<<((bit)&31) & REQUIRED_MASK16)) ||	\

	   (((bit)>>5)==17 && (1UL<<((bit)&31) & REQUIRED_MASK17)))



#define DISABLED_MASK_BIT_SET(bit)					\

	 ( (((bit)>>5)==0  && (1UL<<((bit)&31) & DISABLED_MASK0 )) ||	\
@@ -85,7 +86,8 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; 
	   (((bit)>>5)==13 && (1UL<<((bit)&31) & DISABLED_MASK13)) ||	\

	   (((bit)>>5)==14 && (1UL<<((bit)&31) & DISABLED_MASK14)) ||	\

	   (((bit)>>5)==15 && (1UL<<((bit)&31) & DISABLED_MASK15)) ||	\

	   (((bit)>>5)==16 && (1UL<<((bit)&31) & DISABLED_MASK16)) )

	   (((bit)>>5)==16 && (1UL<<((bit)&31) & DISABLED_MASK16)) ||	\

	   (((bit)>>5)==17 && (1UL<<((bit)&31) & DISABLED_MASK17)))



#define cpu_has(c, bit)							\

	(__builtin_constant_p(bit) && REQUIRED_MASK_BIT_SET(bit) ? 1 :	\

arch/x86/include/asm/disabled-features.h

+1 −0
Original line number Diff line number Diff line
@@ -56,5 +56,6 @@ 
#define DISABLED_MASK14	0

#define DISABLED_MASK15	0

#define DISABLED_MASK16	(DISABLE_PKU|DISABLE_OSPKE)

#define DISABLED_MASK17	0



#endif /* _ASM_X86_DISABLED_FEATURES_H */

arch/x86/include/asm/required-features.h

+1 −0
Original line number Diff line number Diff line
@@ -99,5 +99,6 @@ 
#define REQUIRED_MASK14	0

#define REQUIRED_MASK15	0

#define REQUIRED_MASK16	0

#define REQUIRED_MASK17	0



#endif /* _ASM_X86_REQUIRED_FEATURES_H */