aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq
diff options
context:
space:
mode:
authorKristen Carlson Accardi <kristen@linux.intel.com>2015-04-10 13:21:09 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-10 20:13:28 -0400
commit5f97899d780787a8bbb42dee3be91ab5d8003b7f (patch)
tree5d36e3c5a9357645f1a840f508995963c698012c /drivers/cpufreq
parent4492d1a2e9566495858d25b35093e11509707407 (diff)
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;
1024 1024
1025static int intel_pstate_msrs_not_valid(void) 1025static int intel_pstate_msrs_not_valid(void)
1026{ 1026{
1027 /* Check that all the msr's we are using are valid. */
1028 u64 aperf, mperf, tmp;
1029
1030 rdmsrl(MSR_IA32_APERF, aperf);
1031 rdmsrl(MSR_IA32_MPERF, mperf);
1032
1033 if (!pstate_funcs.get_max() || 1027 if (!pstate_funcs.get_max() ||
1034 !pstate_funcs.get_min() || 1028 !pstate_funcs.get_min() ||
1035 !pstate_funcs.get_turbo()) 1029 !pstate_funcs.get_turbo())
1036 return -ENODEV; 1030 return -ENODEV;
1037 1031
1038 rdmsrl(MSR_IA32_APERF, tmp);
1039 if (!(tmp - aperf))
1040 return -ENODEV;
1041
1042 rdmsrl(MSR_IA32_MPERF, tmp);
1043 if (!(tmp - mperf))
1044 return -ENODEV;
1045
1046 return 0; 1032 return 0;
1047} 1033}
1048 1034