3/3 [retry 1] Add support for AMD MPERF/APERF
PATCH 1/1 3/3 [retry 1] Add support for AMD MPERF/APERF
# HG changeset patch
# User [email protected]
# Date 1269570377 18000
# Node ID 4009c47dfed487f0432b7cbe3b5bac2f805ada73
# Parent d7401eeeac32a315aa9228d012dea2e78052120d Starting with Family 0x10, model 10 processors, some AMD processors will have support for the APERF/MPERF MSRs. This patch adds the checks necessary to support those MSRs.
It also makes the get_measured_perf function defined inside cpufreq.c driver independent. The max_freq is passed to the function by the caller instead of being taking from the acpi-cpufreq only drv_data structure.
This patch supersedes the patch "Add APERF/MPERF support for AMD processors" I sent on March 1, 2010.
xen/arch/x86/acpi/cpufreq/cpufreq.c +1 -1
@@ -269,7 +269,7 @@* Only IA32_APERF/IA32_MPERF ratio is architecturally defined and * no meaning should be associated with absolute values of these MSRs. */ -static unsigned int get_measured_perf (unsigned int cpu,unsigned int flag) +unsigned int get_measured_perf(unsigned int cpu, unsigned int flag, unsigned
int max_freq)
{
struct cpufreq_policy *policy;
struct perf_pair readin, cur, *saved;@@ -353,7 +353,7 @@
#endif
- retval = drv_data[policy->cpu]->max_freq * perf_percent / 100;
+ retval = max_freq * perf_percent / 100;
return retval;
}
xen/arch/x86/acpi/cpufreq/powernow.c +7 -0
@@ -38,6 +38,7 @@#include <acpi/acpi.h> #include <acpi/cpufreq/cpufreq.h> +#define CPUID_6_ECX_APERFMPERF_CAPABILITY (0x1)#define CPUID_FREQ_VOLT_CAPABILITIES 0x80000007#define CPB_CAPABLE 0x00000200#define USE_HW_PSTATE 0x00000080
@@ -61,6 +62,8 @@static struct powernow_cpufreq_data *drv_data[NR_CPUS ]; +static struct cpufreq_driver powernow_cpufreq_driver; +struct drv_cmd {unsigned int type;cpumask_t mask;
@@ -249,6 +252,10 @@if (c->cpuid_level >=6 ) {unsigned int edx; +unsigned int ecx; + ecx =cpuid_ecx (6 ); +if (ecx &CPUID_6_ECX_APERFMPERF_CAPABILITY ) + powernow_cpufreq_driver.getavg = get_measured_perf; edx =cpuid_edx (CPUID_FREQ_VOLT_CAPABILITIES );if ((edx &CPB_CAPABLE ) ==CPB_CAPABLE ) { policy->turbo =1 ;
xen/drivers/cpufreq/utility.c +2 -1
@@ -382,7 +382,8 @@if (cpufreq_driver->getavg) { - freq_avg = cpufreq_driver->getavg (cpu, flag); + freq_avg = cpufreq_driver->getavg (cpu, flag, + policy->cpuinfo.max_freq);if (freq_avg >0 )return freq_avg; }
xen/include/acpi/cpufreq/cpufreq.h +2 -1
@@ -138,7 +138,8 @@unsigned int target_freq, unsigned int relation);unsigned int (*get)(unsigned int cpu); -unsigned int (*getavg)(unsigned int cpu,unsigned int flag); +unsigned int (*getavg)(unsigned int cpu,unsigned int flag, +unsigned int max_freq);int (*exit)(struct cpufreq_policy *policy); };
xen/include/acpi/cpufreq/processor_perf.h +2 -0
@@ -9,6 +9,8 @@int get_cpu_id (u8 );int powernow_cpufreq_init (void );unsigned int powernow_register_driver (void ); +unsigned int get_measured_perf (unsigned int cpu,unsigned int flag, +unsigned int max_freq);void cpufreq_residency_update (unsigned int ,uint8_t );void cpufreq_statistic_update (unsigned int ,uint8_t ,uint8_t );
-------------------------------------------------------
Quoted 43 lines
-----Original Message-----
From: [email protected] [mailto:xen-devel- [email protected]] On Behalf Of Mark Langsdorf
Sent: Tuesday, March 30, 2010 2:29 AM
To: [email protected]; [email protected]
Subject: [Xen-devel] [PATCH] 3/3 [retry 1] Add support for AMD MPERF/APERF# HG changeset patch
# User [email protected]
# Date 1269570377 18000
# Node ID4009c47dfed487f0432b7cbe3b5bac2f805ada73
# Parentd7401eeeac32a315aa9228d012dea2e78052120dStarting with Family0x10, model 10 processors, some AMD processors will have support for the APERF/MPERF MSRs. This patch adds the checks necessary to support those MSRs.It also makes the
get_measured_perffunction defined insidecpufreq.cdriver independent. Themax_freqis passed to the function by the caller instead of being taking from the acpi-cpufreq onlydrv_datastructure.This patch supersedes the patch "Add APERF/MPERF support for AMD processors"
I sent on March 1, 2010.Signed-off-by Mark Langsdorf <[email protected]>diff -r
d7401eeeac32-r4009c47dfed4xen/arch/x86/acpi/cpufreq/cpufreq.cxen/arch/x86/acpi/cpufreq/cpufreq.c +0
-02010 -0500
xen/arch/x86/acpi/cpufreq/cpufreq.c +1
-1@@ -269,7 +269,7 @@* Only IA32_APERF/IA32_MPERF ratio is architecturally defined and * no meaning should be associated with absolute values of these MSRs. */ -static unsigned int get_measured_perf (unsigned int cpu,unsigned int flag) +unsigned int get_measured_perf(unsigned int cpu, unsigned int flag,unsigned
intmax_freq){ struct cpufreq_policy *policy; struct perf_pair readin, cur, *saved;
xen/arch/x86/acpi/cpufreq/cpufreq.c line 359
Quoted 8 lines
xen/arch/x86/acpi/cpufreq/cpufreq.c +1
-1@@ -353,7 +353,7 @@#endif - retval = drv_data[policy->cpu]->max_freq * perf_percent /100 ; + retval = max_freq * perf_percent /100 ;return retval; }
Changing the get_measured_perf interface definition looks not good idea. Leaving interface unchanged and modifying the implementation is more reasonable to me, e.g.
- retval = drv_data[policy->cpu]->max_freq * perf_percent / 100;
+ retval = policy->cpuinfo.max_freq * perf_percent / 100;
Best Regards
Ke