Commit 2eb2802a authored by Dapeng Mi's avatar Dapeng Mi Committed by Peter Zijlstra
Browse files

x86/cpu/intel: Define helper to get CPU core native ID 



Define helper get_this_hybrid_cpu_native_id() to return the CPU core
native ID. This core native ID combining with core type can be used to
figure out the CPU core uarch uniquely.

Signed-off-by: default avatarDapeng Mi <dapeng1.mi@linux.intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarKan Liang <kan.liang@linux.intel.com>
Tested-by: default avatarYongwei Ma <yongwei.ma@intel.com>
Link: https://lkml.kernel.org/r/20240820073853.1974746-3-dapeng1.mi@linux.intel.com
parent 79390db9

arch/x86/include/asm/cpu.h

+6 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ extern bool handle_user_split_lock(struct pt_regs *regs, long error_code); 
extern bool handle_guest_split_lock(unsigned long ip);

extern void handle_bus_lock(struct pt_regs *regs);

u8 get_this_hybrid_cpu_type(void);

u32 get_this_hybrid_cpu_native_id(void);

#else

static inline void __init sld_setup(struct cpuinfo_x86 *c) {}

static inline bool handle_user_split_lock(struct pt_regs *regs, long error_code)
@@ -50,6 +51,11 @@ static inline u8 get_this_hybrid_cpu_type(void) 
{

	return 0;

}



static inline u32 get_this_hybrid_cpu_native_id(void)

{

	return 0;

}

#endif

#ifdef CONFIG_IA32_FEAT_CTL

void init_ia32_feat_ctl(struct cpuinfo_x86 *c);

arch/x86/kernel/cpu/intel.c

+15 −0
Original line number Diff line number Diff line
@@ -1299,3 +1299,18 @@ u8 get_this_hybrid_cpu_type(void) 


	return cpuid_eax(0x0000001a) >> X86_HYBRID_CPU_TYPE_ID_SHIFT;

}



/**

 * get_this_hybrid_cpu_native_id() - Get the native id of this hybrid CPU

 *

 * Returns the uarch native ID [23:0] of a CPU in a hybrid processor.

 * If the processor is not hybrid, returns 0.

 */

u32 get_this_hybrid_cpu_native_id(void)

{

	if (!cpu_feature_enabled(X86_FEATURE_HYBRID_CPU))

		return 0;



	return cpuid_eax(0x0000001a) &

	       (BIT_ULL(X86_HYBRID_CPU_TYPE_ID_SHIFT) - 1);

}