* [tip: x86/cpu] x86/cpu: Move TSC CPUID leaf definition
@ 2024-12-18 14:03 tip-bot2 for Dave Hansen
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Dave Hansen @ 2024-12-18 14:03 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Dave Hansen, Zhao Liu, x86, linux-kernel
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 8f0d085e4d1078407d23beac09d05c074703c147
Gitweb: https://git.kernel.org/tip/8f0d085e4d1078407d23beac09d05c074703c147
Author: Dave Hansen <dave.hansen@linux.intel.com>
AuthorDate: Fri, 13 Dec 2024 12:50:33 -08:00
Committer: Dave Hansen <dave.hansen@linux.intel.com>
CommitterDate: Wed, 18 Dec 2024 05:24:43 -08:00
x86/cpu: Move TSC CPUID leaf definition
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>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Link: https://lore.kernel.org/all/20241213205033.68799E53%40davehans-spike.ostc.intel.com
---
arch/x86/events/intel/pt.c | 1 +
arch/x86/events/intel/pt.h | 3 ---
arch/x86/include/asm/cpuid.h | 1 +
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/x86/events/intel/pt.c b/arch/x86/events/intel/pt.c
index 4b0373b..6081455 100644
--- a/arch/x86/events/intel/pt.c
+++ b/arch/x86/events/intel/pt.c
@@ -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 --git a/arch/x86/events/intel/pt.h b/arch/x86/events/intel/pt.h
index 7ee94fc..2ac3625 100644
--- a/arch/x86/events/intel/pt.h
+++ b/arch/x86/events/intel/pt.h
@@ -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 --git a/arch/x86/include/asm/cpuid.h b/arch/x86/include/asm/cpuid.h
index 8ba4d9f..9b0d14b 100644
--- a/arch/x86/include/asm/cpuid.h
+++ b/arch/x86/include/asm/cpuid.h
@@ -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);
^ permalink raw reply [flat|nested] 2+ messages in thread* [tip: x86/cpu] x86/cpu: Move TSC CPUID leaf definition
@ 2024-12-18 14:22 tip-bot2 for Dave Hansen
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Dave Hansen @ 2024-12-18 14:22 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Dave Hansen, Zhao Liu, x86, linux-kernel
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: a86740a77bf0942e618cc5f022336cdd99530d10
Gitweb: https://git.kernel.org/tip/a86740a77bf0942e618cc5f022336cdd99530d10
Author: Dave Hansen <dave.hansen@linux.intel.com>
AuthorDate: Fri, 13 Dec 2024 12:50:33 -08:00
Committer: Dave Hansen <dave.hansen@linux.intel.com>
CommitterDate: Wed, 18 Dec 2024 06:17:36 -08:00
x86/cpu: Move TSC CPUID leaf definition
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>
Link: https://lore.kernel.org/all/20241213205033.68799E53%40davehans-spike.ostc.intel.com
---
arch/x86/events/intel/pt.c | 1 +
arch/x86/events/intel/pt.h | 3 ---
arch/x86/include/asm/cpuid.h | 1 +
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/x86/events/intel/pt.c b/arch/x86/events/intel/pt.c
index 4b0373b..6081455 100644
--- a/arch/x86/events/intel/pt.c
+++ b/arch/x86/events/intel/pt.c
@@ -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 --git a/arch/x86/events/intel/pt.h b/arch/x86/events/intel/pt.h
index 7ee94fc..2ac3625 100644
--- a/arch/x86/events/intel/pt.h
+++ b/arch/x86/events/intel/pt.h
@@ -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 --git a/arch/x86/include/asm/cpuid.h b/arch/x86/include/asm/cpuid.h
index 8ba4d9f..9b0d14b 100644
--- a/arch/x86/include/asm/cpuid.h
+++ b/arch/x86/include/asm/cpuid.h
@@ -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);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-12-18 14:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-12-18 14:03 [tip: x86/cpu] x86/cpu: Move TSC CPUID leaf definition tip-bot2 for Dave Hansen
2024-12-18 14:22 tip-bot2 for Dave Hansen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®