summaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq
diff options
context:
space:
mode:
authorKristen Carlson Accardi <kristen@linux.intel.com>2015-04-10 19:21:09 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-11 02:13:28 +0200
commit5f97899d780787a8bbb42dee3be91ab5d8003b7f (patch)
tree5d36e3c5a9357645f1a840f508995963c698012c /drivers/cpufreq
parentcpufreq: fix qoriq uniprocessor build (diff)
downloadlinux-5f97899d780787a8bbb42dee3be91ab5d8003b7f.tar.xz
linux-5f97899d780787a8bbb42dee3be91ab5d8003b7f.zip
intel_pstate: remove MSR test
x86_match_cpu will not match our cpuid unless APERF/MPERF flag is set, so there is no need to do the manual check for this MSR. Signed-off-by: Kristen Carlson Accardi <kristen@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r--drivers/cpufreq/intel_pstate.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 872c5772c5d3..8006d86da397 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -1024,25 +1024,11 @@ static unsigned int force_load;
static int intel_pstate_msrs_not_valid(void)
{
- /* Check that all the msr's we are using are valid. */
- u64 aperf, mperf, tmp;
-
- rdmsrl(MSR_IA32_APERF, aperf);
- rdmsrl(MSR_IA32_MPERF, mperf);
-
if (!pstate_funcs.get_max() ||
!pstate_funcs.get_min() ||
!pstate_funcs.get_turbo())
return -ENODEV;
- rdmsrl(MSR_IA32_APERF, tmp);
- if (!(tmp - aperf))
- return -ENODEV;
-
- rdmsrl(MSR_IA32_MPERF, tmp);
- if (!(tmp - mperf))
- return -ENODEV;
-
return 0;
}