Add APERF/MPERF support for AMD processors
PATCH 1/3 Add APERF/MPERF support for AMD processors
Quoted 1 line
From
0bf8a1c25b714ea171ada95d1bf9523a5471f15bMon Sep 17 00:00:00 2001
From: Mark Langsdorf <[email protected]>
Date: Wed, 3 Mar 2010 11:50:33 -0600
Subject: [PATCH] [cpufreq] Add APERF/MPERF support for AMD processors
Starting with model 10 of Family 0x10, AMD processors may have support for APERF/MPERF. Add support for identifying it and using it within cpufreq. Move the APERF/MPERF functions out of the acpi-cpufreq code and into their own file so they can easily be shared.
--- arch/x86/kernel/cpu/amd.c | 6 +++ arch/x86/kernel/cpu/cpufreq/Makefile | 4 +- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 42 +----------------------- arch/x86/kernel/cpu/cpufreq/mperf.c | 50 ++++++++++++++++++++++++++++ arch/x86/kernel/cpu/cpufreq/mperf.h | 9 +++++ arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 11 +++++- 6 files changed, 78 insertions(+), 44 deletions(-) create mode 100644 arch/x86/kernel/cpu/cpufreq/mperf.c create mode 100644 arch/x86/kernel/cpu/cpufreq/mperf.h
arch/x86/kernel/cpu/amd.c +6 -0
@@ -537,6 +537,12 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)set_cpu_cap (c,X86_FEATURE_MFENCE_RDTSC ); } +if (c->cpuid_level >=6 ) { +unsigned ecx =cpuid_ecx (6 ); +if (ecx &0x01 ) +set_cpu_cap (c,X86_FEATURE_APERFMPERF ); + } +#ifdef CONFIG_X86_64 if (c->x86 ==0x10 ) {/* do this for boot cpu */
arch/x86/kernel/cpu/cpufreq/Makefile +2 -2
@@ -2,8 +2,8 @@ # K8 systems. ACPI is preferred to all other hardware-specific drivers. # speedstep-* is preferred over p4-clockmod. -obj-$(CONFIG_X86_POWERNOW_K8) += powernow-k8.o -obj-$(CONFIG_X86_ACPI_CPUFREQ) += acpi-cpufreq.o +obj-$(CONFIG_X86_POWERNOW_K8) += powernow-k8.o mperf.o +obj-$(CONFIG_X86_ACPI_CPUFREQ) += acpi-cpufreq.o mperf.o obj-$(CONFIG_X86_POWERNOW_K6) += powernow-k6.o obj-$(CONFIG_X86_POWERNOW_K7) += powernow-k7.o obj-$(CONFIG_X86_LONGHAUL) += longhaul.o
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +1 -41
60 lines not on this page · raw message
arch/x86/kernel/cpu/cpufreq/mperf.c new file +50 -0
50 lines not on this page · raw message
arch/x86/kernel/cpu/cpufreq/mperf.h new file +9 -0
@@ -0,0 +1,9 @@ +/* +* (c) 2003-2006 Advanced Micro Devices, Inc. +* Your use of this code is subject to the terms and conditions of the +* GNU general public license version 2. See "COPYING" or +* http://www.gnu.org/licenses/gpl.html +*/ + +unsigned int get_measured_perf (struct cpufreq_policy *policy, +unsigned int cpu);
arch/x86/kernel/cpu/cpufreq/powernow-k8.c +10 -1
@@ -46,6 +46,7 @@#define PFX "powernow-k8: "#define VERSION "version 2.20.00"#include "powernow-k8.h" +#include "mperf.h" /* serialize freq changes */ static DEFINE_MUTEX (fidvid_mutex);
@@ -54,6 +55,8 @@ static DEFINE_PER_CPU(struct powernow_k8_data *, powernow_data);static int cpu_family =CPU_OPTERON ; +static struct cpufreq_driver cpufreq_amd64_driver; +#ifndef CONFIG_SMP static inline const struct cpumask *cpu_core_mask (int cpu) {
@@ -929,7 +932,8 @@ static int fill_powernow_table_pstate(struct powernow_k8_data *data, powernow_table[i].index = index;/* Frequency may be rounded for these */ -if (boot_cpu_data.x86 ==0x10 || boot_cpu_data.x86 ==0x11 ) { +if ((boot_cpu_data.x86 ==0x10 && boot_cpu_data.x86_model <10 ) + || boot_cpu_data.x86 ==0x11 ) { powernow_table[i].frequency =freq_from_fid_did (lo &0x3f , (lo >>6 ) &7 ); }else
@@ -1248,6 +1252,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)struct powernow_k8_data *data;struct init_on_cpu init_on_cpu;int rc; +struct cpuinfo_x86 *c = &cpu_data (pol->cpu);if (!cpu_online (pol->cpu))return -ENODEV ;
@@ -1322,6 +1327,10 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)return -EINVAL ; } +/* Check for APERF/MPERF support in hardware */ +if (cpu_has (c,X86_FEATURE_APERFMPERF )) + cpufreq_amd64_driver.getavg = get_measured_perf; +cpufreq_frequency_table_get_attr (data->powernow_table, pol->cpu);if (cpu_family ==CPU_HW_PSTATE )
Signature · 1 line
1.6.0.2
Quoted 8 lines · On Wed, 3 Mar 2010 14:56:56 -0600 Mark Langsdorf <[email protected]> wrote:
arch/x86/kernel/cpu/cpufreq/mperf.c new file +8
-0+unsigned int get_measured_perf (struct cpufreq_policy *policy, +unsigned int cpu) +{ +struct aperfmperf perf; +unsigned long ratio; +unsigned int retval; + +if (smp_call_function_single (cpu, read_measured_perf_ctrs, &perf,1 ))
arch/x86/kernel/cpu/cpufreq/mperf.c line 50
Quoted 10 lines
arch/x86/kernel/cpu/cpufreq/mperf.c new file +10
-0+return 0 ; + + ratio =calc_aperfmperf_ratio (&per_cpu (acfreq_old_perf, cpu), &perf); +per_cpu (acfreq_old_perf, cpu) = perf; + + retval = (policy->cpuinfo.max_freq * ratio) >>APERFMPERF_SHIFT ; + +return retval; +} +EXPORT_SYMBOL_GPL (get_measured_perf);
That's a pretty crappy name for a kernel-wide identifier. cpufreq_get_measured_perf() would be typical and better.