Commit 532cfee6 authored by Naga Chumbalkar's avatar Naga Chumbalkar Committed by Dave Jones

[CPUFREQ] powernow-k8: read P-state from HW

By definition, "cpuinfo_cur_freq" should report the value from HW. So, don't
depend on the cached value. Instead read P-state directly from HW, while
taking into account the erratum 311 workaround for Fam 11h processors.

Cc: Andreas Herrmann <andreas.herrmann3@amd.com>
Cc: Langsdorf, Mark <mark.langsdorf@amd.com>
Cc: Thomas Renninger <trenn@suse.de>
Signed-off-by: default avatarNaga Chumbalkar <nagananda.chumbalkar@hp.com>
Reviewed-by: default avatarAndreas Herrmann <andreas.herrmann3@amd.com>
Tested-by: default avatarAndreas Herrmann <andreas.herrmann3@amd.com>
Acked-by: default avatarLangsdorf, Mark <mark.langsdorf@amd.com>
Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent b394f1df
...@@ -118,20 +118,17 @@ static int query_current_values_with_pending_wait(struct powernow_k8_data *data) ...@@ -118,20 +118,17 @@ static int query_current_values_with_pending_wait(struct powernow_k8_data *data)
u32 i = 0; u32 i = 0;
if (cpu_family == CPU_HW_PSTATE) { if (cpu_family == CPU_HW_PSTATE) {
if (data->currpstate == HW_PSTATE_INVALID) {
/* read (initial) hw pstate if not yet set */
rdmsr(MSR_PSTATE_STATUS, lo, hi); rdmsr(MSR_PSTATE_STATUS, lo, hi);
i = lo & HW_PSTATE_MASK; i = lo & HW_PSTATE_MASK;
data->currpstate = i;
/* /*
* a workaround for family 11h erratum 311 might cause * a workaround for family 11h erratum 311 might cause
* an "out-of-range Pstate if the core is in Pstate-0 * an "out-of-range Pstate if the core is in Pstate-0
*/ */
if (i >= data->numps) if ((boot_cpu_data.x86 == 0x11) && (i >= data->numps))
data->currpstate = HW_PSTATE_0; data->currpstate = HW_PSTATE_0;
else
data->currpstate = i;
}
return 0; return 0;
} }
do { do {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment