Commit e554a8ca authored by H. Peter Anvin (Intel)'s avatar H. Peter Anvin (Intel) Committed by Thomas Gleixner
Browse files

x86/fred: Disable FRED support if CONFIG_X86_FRED is disabled 



Add CONFIG_X86_FRED to <asm/disabled-features.h> to make
cpu_feature_enabled() work correctly with FRED.

Originally-by: default avatarMegha Dey <megha.dey@intel.com>
Signed-off-by: default avatarH. Peter Anvin (Intel) <hpa@zytor.com>
Signed-off-by: default avatarXin Li <xin3.li@intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarShan Kang <shan.kang@intel.com>
Link: https://lore.kernel.org/r/20231205105030.8698-8-xin3.li@intel.com
parent 51c158f7

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

+7 −1
Original line number Diff line number Diff line
@@ -117,6 +117,12 @@ 
#define DISABLE_IBT	(1 << (X86_FEATURE_IBT & 31))

#endif



#ifdef CONFIG_X86_FRED

# define DISABLE_FRED	0

#else

# define DISABLE_FRED	(1 << (X86_FEATURE_FRED & 31))

#endif



/*

 * Make sure to add features to the correct mask

 */
@@ -133,7 +139,7 @@ 
#define DISABLED_MASK10	0

#define DISABLED_MASK11	(DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET| \

			 DISABLE_CALL_DEPTH_TRACKING|DISABLE_USER_SHSTK)

#define DISABLED_MASK12	(DISABLE_LAM)

#define DISABLED_MASK12	(DISABLE_FRED|DISABLE_LAM)

#define DISABLED_MASK13	0

#define DISABLED_MASK14	0

#define DISABLED_MASK15	0

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

+7 −1
Original line number Diff line number Diff line
@@ -117,6 +117,12 @@ 
#define DISABLE_IBT	(1 << (X86_FEATURE_IBT & 31))

#endif



#ifdef CONFIG_X86_FRED

# define DISABLE_FRED	0

#else

# define DISABLE_FRED	(1 << (X86_FEATURE_FRED & 31))

#endif



/*

 * Make sure to add features to the correct mask

 */
@@ -133,7 +139,7 @@ 
#define DISABLED_MASK10	0

#define DISABLED_MASK11	(DISABLE_RETPOLINE|DISABLE_RETHUNK|DISABLE_UNRET| \

			 DISABLE_CALL_DEPTH_TRACKING|DISABLE_USER_SHSTK)

#define DISABLED_MASK12	(DISABLE_LAM)

#define DISABLED_MASK12	(DISABLE_FRED|DISABLE_LAM)

#define DISABLED_MASK13	0

#define DISABLED_MASK14	0

#define DISABLED_MASK15	0