[PATCH 05/10] x86/cpu: Move TSC CPUID leaf definition

Dave Hansen posted 10 patches 1 year ago
[PATCH 05/10] x86/cpu: Move TSC CPUID leaf definition
Posted by Dave Hansen 1 year ago

From: Dave Hansen <dave.hansen@linux.intel.com>

Prepare to use the TSC CPUID leaf definition more widely by moving
it to the common header.

Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
---

 b/arch/x86/events/intel/pt.c   |    1 +
 b/arch/x86/events/intel/pt.h   |    3 ---
 b/arch/x86/include/asm/cpuid.h |    1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff -puN arch/x86/events/intel/pt.c~tsc-leaf-checks-1 arch/x86/events/intel/pt.c
--- a/arch/x86/events/intel/pt.c~tsc-leaf-checks-1	2024-12-13 12:45:34.779136538 -0800
+++ b/arch/x86/events/intel/pt.c	2024-12-13 12:45:34.787136878 -0800
@@ -18,6 +18,7 @@
 #include <linux/slab.h>
 #include <linux/device.h>
 
+#include <asm/cpuid.h>
 #include <asm/perf_event.h>
 #include <asm/insn.h>
 #include <asm/io.h>
diff -puN arch/x86/events/intel/pt.h~tsc-leaf-checks-1 arch/x86/events/intel/pt.h
--- a/arch/x86/events/intel/pt.h~tsc-leaf-checks-1	2024-12-13 12:45:34.779136538 -0800
+++ b/arch/x86/events/intel/pt.h	2024-12-13 12:45:34.787136878 -0800
@@ -37,9 +37,6 @@ struct topa_entry {
 	u64	rsvd4	: 12;
 };
 
-/* TSC to Core Crystal Clock Ratio */
-#define CPUID_TSC_LEAF		0x15
-
 struct pt_pmu {
 	struct pmu		pmu;
 	u32			caps[PT_CPUID_REGS_NUM * PT_CPUID_LEAVES];
diff -puN arch/x86/include/asm/cpuid.h~tsc-leaf-checks-1 arch/x86/include/asm/cpuid.h
--- a/arch/x86/include/asm/cpuid.h~tsc-leaf-checks-1	2024-12-13 12:45:34.783136707 -0800
+++ b/arch/x86/include/asm/cpuid.h	2024-12-13 12:45:34.787136878 -0800
@@ -23,6 +23,7 @@ enum cpuid_regs_idx {
 
 #define CPUID_MWAIT_LEAF	0x5
 #define CPUID_DCA_LEAF		0x9
+#define CPUID_TSC_LEAF		0x15
 
 #ifdef CONFIG_X86_32
 bool have_cpuid_p(void);
_