diff mbox

cpufreq: intel_pstate: Fix setting max_perf_pct in performance policy

Message ID 1413415011-31290-1-git-send-email-pali.rohar@gmail.com (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Pali Rohár Oct. 15, 2014, 11:16 p.m. UTC
Code which changes policy to powersave changes also max_policy_pct based on
max_freq. Code which change max_perf_pct has upper limit base on value
max_policy_pct. When policy is changing from powersave back to performance
then max_policy_pct is not changed. Which means that changing max_perf_pct is
not possible to high values if max_freq was too low in powersave policy.

Test case:

$ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
800000
$ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
3300000
$ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
performance
$ cat /sys/devices/system/cpu/intel_pstate/max_perf_pct
100

$ echo powersave > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
$ echo 800000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
$ echo 20 > /sys/devices/system/cpu/intel_pstate/max_perf_pct

$ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
powersave
$ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
800000
$ cat /sys/devices/system/cpu/intel_pstate/max_perf_pct
20

$ echo performance > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
$ echo 3300000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
$ echo 100 > /sys/devices/system/cpu/intel_pstate/max_perf_pct

$ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
performance
$ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
3300000
$ cat /sys/devices/system/cpu/intel_pstate/max_perf_pct
24

And now intel_pstate driver allows to set maximal value for max_perf_pct based
on max_policy_pct which is 24 for previous powersave max_freq 800000.

This patch will set default value for max_policy_pct when setting policy to
performance so it will allow to set also max value for max_perf_pct.

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
Cc: stable@vger.kernel.org
---
 drivers/cpufreq/intel_pstate.c |    1 +
 1 file changed, 1 insertion(+)

Comments

Viresh Kumar Oct. 16, 2014, 8:17 a.m. UTC | #1
Cc'ing Dirk.

On 16 October 2014 04:46, Pali Rohár <pali.rohar@gmail.com> wrote:
> Code which changes policy to powersave changes also max_policy_pct based on
> max_freq. Code which change max_perf_pct has upper limit base on value
> max_policy_pct. When policy is changing from powersave back to performance
> then max_policy_pct is not changed. Which means that changing max_perf_pct is
> not possible to high values if max_freq was too low in powersave policy.
>
> Test case:
>
> $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
> 800000
> $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
> 3300000
> $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
> performance
> $ cat /sys/devices/system/cpu/intel_pstate/max_perf_pct
> 100
>
> $ echo powersave > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
> $ echo 800000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
> $ echo 20 > /sys/devices/system/cpu/intel_pstate/max_perf_pct
>
> $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
> powersave
> $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
> 800000
> $ cat /sys/devices/system/cpu/intel_pstate/max_perf_pct
> 20
>
> $ echo performance > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
> $ echo 3300000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
> $ echo 100 > /sys/devices/system/cpu/intel_pstate/max_perf_pct
>
> $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
> performance
> $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
> 3300000
> $ cat /sys/devices/system/cpu/intel_pstate/max_perf_pct
> 24
>
> And now intel_pstate driver allows to set maximal value for max_perf_pct based
> on max_policy_pct which is 24 for previous powersave max_freq 800000.
>
> This patch will set default value for max_policy_pct when setting policy to
> performance so it will allow to set also max value for max_perf_pct.
>
> Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
> Cc: stable@vger.kernel.org
> ---
>  drivers/cpufreq/intel_pstate.c |    1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
> index 0668b38..7547ab5 100644
> --- a/drivers/cpufreq/intel_pstate.c
> +++ b/drivers/cpufreq/intel_pstate.c
> @@ -714,6 +714,7 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)
>         if (policy->policy == CPUFREQ_POLICY_PERFORMANCE) {
>                 limits.min_perf_pct = 100;
>                 limits.min_perf = int_tofp(1);
> +               limits.max_policy_pct = 100;
>                 limits.max_perf_pct = 100;
>                 limits.max_perf = int_tofp(1);
>                 limits.no_turbo = limits.turbo_disabled;
> --
> 1.7.9.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rafael J. Wysocki Oct. 16, 2014, 8:50 a.m. UTC | #2
On Thursday, October 16, 2014 01:16:51 AM Pali Rohár wrote:
> Code which changes policy to powersave changes also max_policy_pct based on
> max_freq. Code which change max_perf_pct has upper limit base on value
> max_policy_pct. When policy is changing from powersave back to performance
> then max_policy_pct is not changed. Which means that changing max_perf_pct is
> not possible to high values if max_freq was too low in powersave policy.

Dirk, what do you think?

> Test case:
> 
> $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
> 800000
> $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
> 3300000
> $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
> performance
> $ cat /sys/devices/system/cpu/intel_pstate/max_perf_pct
> 100
> 
> $ echo powersave > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
> $ echo 800000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
> $ echo 20 > /sys/devices/system/cpu/intel_pstate/max_perf_pct
> 
> $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
> powersave
> $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
> 800000
> $ cat /sys/devices/system/cpu/intel_pstate/max_perf_pct
> 20
> 
> $ echo performance > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
> $ echo 3300000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
> $ echo 100 > /sys/devices/system/cpu/intel_pstate/max_perf_pct
> 
> $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
> performance
> $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
> 3300000
> $ cat /sys/devices/system/cpu/intel_pstate/max_perf_pct
> 24
> 
> And now intel_pstate driver allows to set maximal value for max_perf_pct based
> on max_policy_pct which is 24 for previous powersave max_freq 800000.
> 
> This patch will set default value for max_policy_pct when setting policy to
> performance so it will allow to set also max value for max_perf_pct.
> 
> Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
> Cc: stable@vger.kernel.org
> ---
>  drivers/cpufreq/intel_pstate.c |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
> index 0668b38..7547ab5 100644
> --- a/drivers/cpufreq/intel_pstate.c
> +++ b/drivers/cpufreq/intel_pstate.c
> @@ -714,6 +714,7 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)
>  	if (policy->policy == CPUFREQ_POLICY_PERFORMANCE) {
>  		limits.min_perf_pct = 100;
>  		limits.min_perf = int_tofp(1);
> +		limits.max_policy_pct = 100;
>  		limits.max_perf_pct = 100;
>  		limits.max_perf = int_tofp(1);
>  		limits.no_turbo = limits.turbo_disabled;
>
dirk.brandewie@gmail.com Oct. 16, 2014, 3:05 p.m. UTC | #3
On 10/15/2014 04:16 PM, Pali Rohár wrote:
> Code which changes policy to powersave changes also max_policy_pct based on
> max_freq. Code which change max_perf_pct has upper limit base on value
> max_policy_pct. When policy is changing from powersave back to performance
> then max_policy_pct is not changed. Which means that changing max_perf_pct is
> not possible to high values if max_freq was too low in powersave policy.
>
> Test case:
>
> $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
> 800000
> $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
> 3300000
> $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
> performance
> $ cat /sys/devices/system/cpu/intel_pstate/max_perf_pct
> 100
>
> $ echo powersave > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
> $ echo 800000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
> $ echo 20 > /sys/devices/system/cpu/intel_pstate/max_perf_pct
>
> $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
> powersave
> $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
> 800000
> $ cat /sys/devices/system/cpu/intel_pstate/max_perf_pct
> 20
>
> $ echo performance > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
> $ echo 3300000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
> $ echo 100 > /sys/devices/system/cpu/intel_pstate/max_perf_pct
>
> $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
> performance
> $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
> 3300000
> $ cat /sys/devices/system/cpu/intel_pstate/max_perf_pct
> 24
>
> And now intel_pstate driver allows to set maximal value for max_perf_pct based
> on max_policy_pct which is 24 for previous powersave max_freq 800000.
>
> This patch will set default value for max_policy_pct when setting policy to
> performance so it will allow to set also max value for max_perf_pct.
>
> Signed-off-by: Pali Rohár <pali.rohar@gmail.com>

Acked-by: Dirk Brandewie <dirk.j.brandewie@intel.com>

> Cc: stable@vger.kernel.org
> ---
>   drivers/cpufreq/intel_pstate.c |    1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
> index 0668b38..7547ab5 100644
> --- a/drivers/cpufreq/intel_pstate.c
> +++ b/drivers/cpufreq/intel_pstate.c
> @@ -714,6 +714,7 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy)
>   	if (policy->policy == CPUFREQ_POLICY_PERFORMANCE) {
>   		limits.min_perf_pct = 100;
>   		limits.min_perf = int_tofp(1);
> +		limits.max_policy_pct = 100;
>   		limits.max_perf_pct = 100;
>   		limits.max_perf = int_tofp(1);
>   		limits.no_turbo = limits.turbo_disabled;
>

--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rafael J. Wysocki Oct. 21, 2014, 1:30 p.m. UTC | #4
On Thursday, October 16, 2014 08:05:44 AM Dirk Brandewie wrote:
> On 10/15/2014 04:16 PM, Pali Rohár wrote:
> > Code which changes policy to powersave changes also max_policy_pct based on
> > max_freq. Code which change max_perf_pct has upper limit base on value
> > max_policy_pct. When policy is changing from powersave back to performance
> > then max_policy_pct is not changed. Which means that changing max_perf_pct is
> > not possible to high values if max_freq was too low in powersave policy.
> >
> > Test case:
> >
> > $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
> > 800000
> > $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
> > 3300000
> > $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
> > performance
> > $ cat /sys/devices/system/cpu/intel_pstate/max_perf_pct
> > 100
> >
> > $ echo powersave > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
> > $ echo 800000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
> > $ echo 20 > /sys/devices/system/cpu/intel_pstate/max_perf_pct
> >
> > $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
> > powersave
> > $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
> > 800000
> > $ cat /sys/devices/system/cpu/intel_pstate/max_perf_pct
> > 20
> >
> > $ echo performance > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
> > $ echo 3300000 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
> > $ echo 100 > /sys/devices/system/cpu/intel_pstate/max_perf_pct
> >
> > $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
> > performance
> > $ cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq
> > 3300000
> > $ cat /sys/devices/system/cpu/intel_pstate/max_perf_pct
> > 24
> >
> > And now intel_pstate driver allows to set maximal value for max_perf_pct based
> > on max_policy_pct which is 24 for previous powersave max_freq 800000.
> >
> > This patch will set default value for max_policy_pct when setting policy to
> > performance so it will allow to set also max value for max_perf_pct.
> >
> > Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
> 
> Acked-by: Dirk Brandewie <dirk.j.brandewie@intel.com>

Applied, thanks!
diff mbox

Patch

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 0668b38..7547ab5 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -714,6 +714,7 @@  static int intel_pstate_set_policy(struct cpufreq_policy *policy)
 	if (policy->policy == CPUFREQ_POLICY_PERFORMANCE) {
 		limits.min_perf_pct = 100;
 		limits.min_perf = int_tofp(1);
+		limits.max_policy_pct = 100;
 		limits.max_perf_pct = 100;
 		limits.max_perf = int_tofp(1);
 		limits.no_turbo = limits.turbo_disabled;