Commit 236761f1 authored by Zhuguangqing's avatar Zhuguangqing Committed by Daniel Lezcano
Browse files

thermal/drivers/cpufreq_cooling: Update cpufreq_state only if state has changed 



If state has not changed successfully and we updated cpufreq_state,
next time when the new state is equal to cpufreq_state (not changed
successfully last time), we will return directly and miss a
freq_qos_update_request() that should have been.

Fixes: 5130802d ("thermal: cpu_cooling: Switch to QoS requests for freq limits")
Cc: v5.4+ <stable@vger.kernel.org> # v5.4+
Signed-off-by: default avatarZhuguangqing <zhuguangqing@xiaomi.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20201106092243.15574-1-zhuguangqing83@gmail.com
parent 030a48b0

drivers/thermal/cpufreq_cooling.c

+1 −3
Original line number Diff line number Diff line
@@ -438,13 +438,11 @@ static int cpufreq_set_cur_state(struct thermal_cooling_device *cdev, 
	if (cpufreq_cdev->cpufreq_state == state)

		return 0;



	cpufreq_cdev->cpufreq_state = state;



	frequency = get_state_freq(cpufreq_cdev, state);



	ret = freq_qos_update_request(&cpufreq_cdev->qos_req, frequency);



	if (ret > 0) {

		cpufreq_cdev->cpufreq_state = state;

		cpus = cpufreq_cdev->policy->cpus;

		max_capacity = arch_scale_cpu_capacity(cpumask_first(cpus));

		capacity = frequency * max_capacity;