diff options
| author | Dirk Brandewie <dirk.j.brandewie@intel.com> | 2014-01-06 13:59:16 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-15 18:28:53 -0500 |
| commit | d0ccf8a11507ae170d8db47babad5331a4cdb33f (patch) | |
| tree | 07347bfa21a87e10cae370c7b116812fd583fbaf /drivers/cpufreq | |
| parent | 9b788c26a953d491617b05d1f4c63895524e7dab (diff) | |
intel_pstate: Add X86_FEATURE_APERFMPERF to cpu match parameters.
commit 6cbd7ee10e2842a3d1f9b60abede1c8f3d1f1130 upstream.
KVM environments do not support APERF/MPERF MSRs. intel_pstate cannot
operate without these registers.
The previous validity checks in intel_pstate_msrs_not_valid() are
insufficent in nested KVMs.
References: https://bugzilla.redhat.com/show_bug.cgi?id=1046317
Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/intel_pstate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 7054c579d451..a22fb3e47256 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c | |||
| @@ -516,7 +516,8 @@ static void intel_pstate_timer_func(unsigned long __data) | |||
| 516 | } | 516 | } |
| 517 | 517 | ||
| 518 | #define ICPU(model, policy) \ | 518 | #define ICPU(model, policy) \ |
| 519 | { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long)&policy } | 519 | { X86_VENDOR_INTEL, 6, model, X86_FEATURE_APERFMPERF,\ |
| 520 | (unsigned long)&policy } | ||
| 520 | 521 | ||
| 521 | static const struct x86_cpu_id intel_pstate_cpu_ids[] = { | 522 | static const struct x86_cpu_id intel_pstate_cpu_ids[] = { |
| 522 | ICPU(0x2a, default_policy), | 523 | ICPU(0x2a, default_policy), |