Commit 395da125 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpufreq-fixes' 

* pm-cpufreq-fixes:
  cpufreq: Abort cpufreq_update_current_freq() for cpufreq_suspended set
  intel_pstate: Avoid getting stuck in high P-states when idle
parents c3b46c73 c9d9c929

drivers/cpufreq/cpufreq.c

+3 −0
Original line number Diff line number Diff line
@@ -1491,6 +1491,9 @@ static unsigned int cpufreq_update_current_freq(struct cpufreq_policy *policy) 
{

	unsigned int new_freq;



	if (cpufreq_suspended)

		return 0;



	new_freq = cpufreq_driver->get(policy->cpu);

	if (!new_freq)

		return 0;

drivers/cpufreq/intel_pstate.c

+4 −0
Original line number Diff line number Diff line
@@ -1130,6 +1130,10 @@ static inline int32_t get_target_pstate_use_performance(struct cpudata *cpu) 
		sample_ratio = div_fp(int_tofp(pid_params.sample_rate_ns),

				      int_tofp(duration_ns));

		core_busy = mul_fp(core_busy, sample_ratio);

	} else {

		sample_ratio = div_fp(100 * cpu->sample.mperf, cpu->sample.tsc);

		if (sample_ratio < int_tofp(1))

			core_busy = 0;

	}



	cpu->sample.busy_scaled = core_busy;