diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-02 18:08:56 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-02 18:08:56 +0200 |
| commit | 726dcbe5f5d88080b9106f3a55b95d358b2aa140 (patch) | |
| tree | 7699d33c6e8ade748e3c4154933be8d2b475b25d /drivers/cpufreq/intel_pstate.c | |
| parent | 8a21c0e745cf726d5cb5ed0cfdee5857d2dd0ce7 (diff) | |
| parent | 19ea1a4400e9b8a3858c358509e2514d4eef785f (diff) | |
Merge branch 'pm-fixes'
* pm-fixes:
intel_pstate: fix no_turbo
cpufreq: cpufreq-cpu0: NULL is a valid regulator, part 2
cpufreq: SPEAr: Fix incorrect variable type
PM / hibernate: Fix user space driven resume regression
Diffstat (limited to 'drivers/cpufreq/intel_pstate.c')
| -rw-r--r-- | drivers/cpufreq/intel_pstate.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 9733f29ed148..32b3479a2405 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -394,7 +394,10 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate) trace_cpu_frequency(pstate * 100000, cpu->cpu); cpu->pstate.current_pstate = pstate; - wrmsrl(MSR_IA32_PERF_CTL, pstate << 8); + if (limits.no_turbo) + wrmsrl(MSR_IA32_PERF_CTL, BIT(32) | (pstate << 8)); + else + wrmsrl(MSR_IA32_PERF_CTL, pstate << 8); } |