stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] thermal/drivers/cpufreq_cooling: Update cpufreq_state only if state has changed
@ 2020-11-06  9:22 zhuguangqing83
  2020-11-06  9:25 ` Viresh Kumar
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: zhuguangqing83 @ 2020-11-06  9:22 UTC (permalink / raw)
  To: viresh.kumar, amit.kachhap, daniel.lezcano, javi.merino,
	rui.zhang, amitk
  Cc: linux-pm, linux-kernel, Zhuguangqing, v5 . 4+

From: Zhuguangqing <zhuguangqing@xiaomi.com>

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>
---
v2:
  - Add Fixes: 5130802ddbb1 in log.
  - Add Cc: v5.4+ <stable@vger.kernel.org> # v5.4+ in log.
  - Add Acked-by: Viresh Kumar <viresh.kumar@linaro.org> in log.
  - Delete an extra blank line.
---
 drivers/thermal/cpufreq_cooling.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/thermal/cpufreq_cooling.c b/drivers/thermal/cpufreq_cooling.c
index cc2959f22f01..612f063c1cfc 100644
--- a/drivers/thermal/cpufreq_cooling.c
+++ b/drivers/thermal/cpufreq_cooling.c
@@ -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;
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH v2] thermal/drivers/cpufreq_cooling: Update cpufreq_state only if state has changed
  2020-11-06  9:22 [PATCH v2] thermal/drivers/cpufreq_cooling: Update cpufreq_state only if state has changed zhuguangqing83
@ 2020-11-06  9:25 ` Viresh Kumar
  2020-11-12 11:24 ` Daniel Lezcano
  2020-11-24  9:36 ` [thermal: thermal/next] " thermal-bot for Zhuguangqing
  2 siblings, 0 replies; 5+ messages in thread
From: Viresh Kumar @ 2020-11-06  9:25 UTC (permalink / raw)
  To: zhuguangqing83
  Cc: amit.kachhap, daniel.lezcano, javi.merino, rui.zhang, amitk,
	linux-pm, linux-kernel, Zhuguangqing, v5 . 4+

On 06-11-20, 17:22, zhuguangqing83@gmail.com wrote:
> From: Zhuguangqing <zhuguangqing@xiaomi.com>
> 
> 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>
> ---
> v2:
>   - Add Fixes: 5130802ddbb1 in log.
>   - Add Cc: v5.4+ <stable@vger.kernel.org> # v5.4+ in log.
>   - Add Acked-by: Viresh Kumar <viresh.kumar@linaro.org> in log.
>   - Delete an extra blank line.
> ---
>  drivers/thermal/cpufreq_cooling.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/thermal/cpufreq_cooling.c b/drivers/thermal/cpufreq_cooling.c
> index cc2959f22f01..612f063c1cfc 100644
> --- a/drivers/thermal/cpufreq_cooling.c
> +++ b/drivers/thermal/cpufreq_cooling.c
> @@ -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;

Thanks Zhuguangqing.

-- 
viresh

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH v2] thermal/drivers/cpufreq_cooling: Update cpufreq_state only if state has changed
  2020-11-06  9:22 [PATCH v2] thermal/drivers/cpufreq_cooling: Update cpufreq_state only if state has changed zhuguangqing83
  2020-11-06  9:25 ` Viresh Kumar
@ 2020-11-12 11:24 ` Daniel Lezcano
  2020-11-24  9:36 ` [thermal: thermal/next] " thermal-bot for Zhuguangqing
  2 siblings, 0 replies; 5+ messages in thread
From: Daniel Lezcano @ 2020-11-12 11:24 UTC (permalink / raw)
  To: zhuguangqing83, viresh.kumar, amit.kachhap, javi.merino,
	rui.zhang, amitk
  Cc: linux-pm, linux-kernel, Zhuguangqing, v5 . 4+

On 06/11/2020 10:22, zhuguangqing83@gmail.com wrote:
> From: Zhuguangqing <zhuguangqing@xiaomi.com>
> 
> 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>
> ---

Applied, thanks


-- 
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [thermal: thermal/next] thermal/drivers/cpufreq_cooling: Update cpufreq_state only if state has changed
  2020-11-06  9:22 [PATCH v2] thermal/drivers/cpufreq_cooling: Update cpufreq_state only if state has changed zhuguangqing83
  2020-11-06  9:25 ` Viresh Kumar
  2020-11-12 11:24 ` Daniel Lezcano
@ 2020-11-24  9:36 ` thermal-bot for Zhuguangqing
  2 siblings, 0 replies; 5+ messages in thread
From: thermal-bot for Zhuguangqing @ 2020-11-24  9:36 UTC (permalink / raw)
  To: linux-pm
  Cc: v5.4+, Zhuguangqing, Viresh Kumar, Daniel Lezcano, rui.zhang, amitk

The following commit has been merged into the thermal/next branch of thermal:

Commit-ID:     236761f19a4f373354f1dcf399b57753f1f4b871
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//236761f19a4f373354f1dcf399b57753f1f4b871
Author:        Zhuguangqing <zhuguangqing@xiaomi.com>
AuthorDate:    Fri, 06 Nov 2020 17:22:43 +08:00
Committer:     Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Thu, 12 Nov 2020 12:23:35 +01:00

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: 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
---
 drivers/thermal/cpufreq_cooling.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/thermal/cpufreq_cooling.c b/drivers/thermal/cpufreq_cooling.c
index cc2959f..612f063 100644
--- a/drivers/thermal/cpufreq_cooling.c
+++ b/drivers/thermal/cpufreq_cooling.c
@@ -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;

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH v2] thermal/drivers/cpufreq_cooling: Update cpufreq_state only if state has changed
@ 2020-11-06  9:14 zhuguangqing83
  0 siblings, 0 replies; 5+ messages in thread
From: zhuguangqing83 @ 2020-11-06  9:14 UTC (permalink / raw)
  To: zhuguanqing; +Cc: Zhuguangqing, v5 . 4+

From: Zhuguangqing <zhuguangqing@xiaomi.com>

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>
---
v2:
  - Add Fixes: 5130802ddbb1 in log.
  - Add Cc: v5.4+ <stable@vger.kernel.org> # v5.4+ in log.
  - Add Acked-by: Viresh Kumar <viresh.kumar@linaro.org> in log.
  - Delete an extra blank line.
---
 drivers/thermal/cpufreq_cooling.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/thermal/cpufreq_cooling.c b/drivers/thermal/cpufreq_cooling.c
index cc2959f22f01..612f063c1cfc 100644
--- a/drivers/thermal/cpufreq_cooling.c
+++ b/drivers/thermal/cpufreq_cooling.c
@@ -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;
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-11-24  9:37 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-06  9:22 [PATCH v2] thermal/drivers/cpufreq_cooling: Update cpufreq_state only if state has changed zhuguangqing83
2020-11-06  9:25 ` Viresh Kumar
2020-11-12 11:24 ` Daniel Lezcano
2020-11-24  9:36 ` [thermal: thermal/next] " thermal-bot for Zhuguangqing
  -- strict thread matches above, loose matches on Subject: below --
2020-11-06  9:14 [PATCH v2] " zhuguangqing83

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).