Skip to contentSkip to conversation

x86: Move APERF/MPERF into a X86_FEATURE

tip:sched/core tip-bot for Peter Zijlstra 1 participant 1 message Sep 16, 2009 x86

lore
Share & tools
lore
#0 lore raw
Commit-ID:  a8303aaf2b2f74714db6d204ab4fcb810942664e
Gitweb:     http://git.kernel.org/tip/a8303aaf2b2f74714db6d204ab4fcb810942664e
Author:     Peter Zijlstra <[email protected]>
AuthorDate: Wed, 2 Sep 2009 10:56:56 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 15 Sep 2009 16:51:25 +0200

x86: Move APERF/MPERF into a X86_FEATURE

Move the APERFMPERF capacility into a X86_FEATURE flag so that it can be used outside of the acpi cpufreq driver.

Cc H. Peter Anvin <[email protected]>
Cc Venkatesh Pallipadi <[email protected]>
Cc Yanmin <[email protected]>
Cc Dave Jones <[email protected]>
Cc Len Brown <[email protected]>
Cc Yinghai Lu <[email protected]>

LKML-Reference: <new-submission>

---
 arch/x86/include/asm/cpufeature.h          |    1 +
 arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c |    9 ++-------
 arch/x86/kernel/cpu/intel.c                |    6 ++++++
 3 files changed, 9 insertions(+), 7 deletions(-)
arch/x86/include/asm/cpufeature.h +1 -0
index 847fee6..9cfc88b 100644
@@ -96,6 +96,7 @@
 #define X86_FEATURE_CLFLUSH_MONITOR (3*32+25) /* "" clflush reqd with monitor */
 #define X86_FEATURE_EXTD_APICID	(3*32+26) /* has extended APICID (8 bits) */
 #define X86_FEATURE_AMD_DCM     (3*32+27) /* multi-node processor */
+#define X86_FEATURE_APERFMPERF	(3*32+28) /* APERFMPERF */
 
 /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */
 #define X86_FEATURE_XMM3	(4*32+ 0) /* "pni" SSE-3 */
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +2 -7
index ae9b503..509e6a7 100644
@@ -60,7 +60,6 @@ enum {
 };
 
 #define INTEL_MSR_RANGE		(0xffff)
-#define CPUID_6_ECX_APERFMPERF_CAPABILITY	(0x1)
 
 struct acpi_cpufreq_data {
 	struct acpi_processor_performance *acpi_data;
@@ -731,12 +730,8 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
 	acpi_processor_notify_smm(THIS_MODULE);
 
 	/* Check for APERF/MPERF support in hardware */
-	if (c->x86_vendor == X86_VENDOR_INTEL && c->cpuid_level >= 6) {
-		unsigned int ecx;
-		ecx = cpuid_ecx(6);
-		if (ecx & CPUID_6_ECX_APERFMPERF_CAPABILITY)
-			acpi_cpufreq_driver.getavg = get_measured_perf;
-	}
+	if (cpu_has(c, X86_FEATURE_APERFMPERF))
+		acpi_cpufreq_driver.getavg = get_measured_perf;
 
 	dprintk("CPU%u - ACPI performance management activated.\n", cpu);
 	for (i = 0; i < perf->state_count; i++)
arch/x86/kernel/cpu/intel.c +6 -0
index 80a722a..40e1835 100644
@@ -350,6 +350,12 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
 			set_cpu_cap(c, X86_FEATURE_ARCH_PERFMON);
 	}
 
+	if (c->cpuid_level > 6) {
+		unsigned ecx = cpuid_ecx(6);
+		if (ecx & 0x01)
+			set_cpu_cap(c, X86_FEATURE_APERFMPERF);
+	}
+
 	if (cpu_has_xmm2)
 		set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);
 	if (cpu_has_ds) {