| Message ID | 7c80add4a09e3b1f24f4de322d3d4b4bda0db5ba.1609224933.git.viresh.kumar@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [for,5.4] thermal/drivers/cpu_cooling: Update cpufreq_state only if state has changed | expand |
On Tue, Dec 29, 2020 at 12:26:39PM +0530, Viresh Kumar wrote: > From: Zhuguangqing <zhuguangqing@xiaomi.com> > > [ Upstream commit 236761f19a4f373354f1dcf399b57753f1f4b871 ] > > 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: 5130802ddbb1 ("thermal: cpu_cooling: Switch to QoS requests for freq limits") > Cc: v5.4+ <stable@vger.kernel.org> # v5.4+ > Signed-off-by: Zhuguangqing <zhuguangqing@xiaomi.com> > Acked-by: Viresh Kumar <viresh.kumar@linaro.org> > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > Link: https://lore.kernel.org/r/20201106092243.15574-1-zhuguangqing83@gmail.com > [ Viresh: Redo the patch for 5.4 stable kernel ] > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> > --- > drivers/thermal/cpu_cooling.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) Now applied, thanks. greg k-h
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index c37886a26712..9d24bc05df0d 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -320,6 +320,7 @@ static int cpufreq_set_cur_state(struct thermal_cooling_device *cdev, unsigned long state) { struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata; + int ret; /* Request state should be less than max_level */ if (WARN_ON(state > cpufreq_cdev->max_level)) @@ -329,10 +330,12 @@ static int cpufreq_set_cur_state(struct thermal_cooling_device *cdev, if (cpufreq_cdev->cpufreq_state == state) return 0; - cpufreq_cdev->cpufreq_state = state; + ret = freq_qos_update_request(&cpufreq_cdev->qos_req, + cpufreq_cdev->freq_table[state].frequency); + if (ret > 0) + cpufreq_cdev->cpufreq_state = state; - return freq_qos_update_request(&cpufreq_cdev->qos_req, - cpufreq_cdev->freq_table[state].frequency); + return ret; } /**