Due to CPB we can't directly map SW Pstates to Pstate MSRs. Get rid of the paranoia check. (assuming that the ACPI Pstate information is correct.)
Signed-off-by: Andreas Herrmann <[email protected]> Signed-off-by: Dave Jones <[email protected]> --- drivers/cpufreq/powernow-k8.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) Hi, Please apply these two patches to 3.0, 3.1, 3.2 stable trees. They are fixing a panic that might happen on AMD systems with certain BIOS settings. Upstream commit IDs of the two patches are 201bf0f129e1715a33568d1563d9a75b840ab4d3 ([CPUFREQ] powernow-k8: Avoid Pstate MSR accesses on systems supporting CPB) and a8eb28480e9b637cc78b9aa5e08612ba97e1317a ([CPUFREQ] powernow-k8: Fix indexing issue) Thanks, Andreas diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c index bce576d..e0329f9 100644 --- a/drivers/cpufreq/powernow-k8.c +++ b/drivers/cpufreq/powernow-k8.c @@ -926,23 +926,24 @@ static int fill_powernow_table_pstate(struct powernow_k8_data *data, invalidate_entry(powernow_table, i); continue; } - rdmsr(MSR_PSTATE_DEF_BASE + index, lo, hi); - if (!(hi & HW_PSTATE_VALID_MASK)) { - pr_debug("invalid pstate %d, ignoring\n", index); - invalidate_entry(powernow_table, i); - continue; - } - - powernow_table[i].index = index; - /* Frequency may be rounded for these */ if ((boot_cpu_data.x86 == 0x10 && boot_cpu_data.x86_model < 10) || boot_cpu_data.x86 == 0x11) { + + rdmsr(MSR_PSTATE_DEF_BASE + index, lo, hi); + if (!(hi & HW_PSTATE_VALID_MASK)) { + pr_debug("invalid pstate %d, ignoring\n", index); + invalidate_entry(powernow_table, i); + continue; + } + powernow_table[i].frequency = freq_from_fid_did(lo & 0x3f, (lo >> 6) & 7); } else powernow_table[i].frequency = data->acpi_data.states[i].core_frequency * 1000; + + powernow_table[i].index = index; } return 0; } -- 1.7.8.4 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
