leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PM / devfreq: Don't adjust to user limits in governors

Browse Source 
Several governors use the user space limits df->min/max_freq to adjust
the target frequency. This is not necessary, since update_devfreq()
already takes care of this. Instead the governor can request the available
min/max frequency by setting the target frequency to DEVFREQ_MIN/MAX_FREQ
and let update_devfreq() take care of any adjustments.

Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
This commit is contained in:
Matthias Kaehlcke
2018-08-03 13:05:10 -07:00
committed by MyungJoo Ham
parent df5cf4a361
commit 6ff66e2a00
5 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/devfreq/governor.h
View File

@@ -25,6 +25,9 @@
#define DEVFREQ_GOV_SUSPEND 0x4 #define DEVFREQ_GOV_SUSPEND 0x4
#define DEVFREQ_GOV_RESUME 0x5 #define DEVFREQ_GOV_RESUME 0x5
#define DEVFREQ_MIN_FREQ 0
#define DEVFREQ_MAX_FREQ ULONG_MAX
/** /**
* struct devfreq_governor - Devfreq policy governor * struct devfreq_governor - Devfreq policy governor
* @node: list node - contains registered devfreq governors * @node: list node - contains registered devfreq governors

5
drivers/devfreq/governor_performance.c
View File

@@ -20,10 +20,7 @@ static int devfreq_performance_func(struct devfreq *df,
* target callback should be able to get floor value as * target callback should be able to get floor value as
* said in devfreq.h * said in devfreq.h
*/ */
if (!df->max_freq) *freq = DEVFREQ_MAX_FREQ;
*freq = UINT_MAX;
else
*freq = df->max_freq;
return 0; return 0;
} }

2
drivers/devfreq/governor_powersave.c
View File

@@ -20,7 +20,7 @@ static int devfreq_powersave_func(struct devfreq *df,
* target callback should be able to get ceiling value as * target callback should be able to get ceiling value as
* said in devfreq.h * said in devfreq.h
*/ */
*freq = df->min_freq; *freq = DEVFREQ_MIN_FREQ;
return 0; return 0;
} }

12
drivers/devfreq/governor_simpleondemand.c
View File

@@ -27,7 +27,6 @@ static int devfreq_simple_ondemand_func(struct devfreq *df,
unsigned int dfso_upthreshold = DFSO_UPTHRESHOLD; unsigned int dfso_upthreshold = DFSO_UPTHRESHOLD;
unsigned int dfso_downdifferential = DFSO_DOWNDIFFERENCTIAL; unsigned int dfso_downdifferential = DFSO_DOWNDIFFERENCTIAL;
struct devfreq_simple_ondemand_data *data = df->data; struct devfreq_simple_ondemand_data *data = df->data;
unsigned long max = (df->max_freq) ? df->max_freq : UINT_MAX;
err = devfreq_update_stats(df); err = devfreq_update_stats(df);
if (err) if (err)
@@ -47,7 +46,7 @@ static int devfreq_simple_ondemand_func(struct devfreq *df,
/* Assume MAX if it is going to be divided by zero */ /* Assume MAX if it is going to be divided by zero */
if (stat->total_time == 0) { if (stat->total_time == 0) {
*freq = max; *freq = DEVFREQ_MAX_FREQ;
return 0; return 0;
} }
@@ -60,13 +59,13 @@ static int devfreq_simple_ondemand_func(struct devfreq *df,
/* Set MAX if it's busy enough */ /* Set MAX if it's busy enough */
if (stat->busy_time * 100 > if (stat->busy_time * 100 >
stat->total_time * dfso_upthreshold) { stat->total_time * dfso_upthreshold) {
*freq = max; *freq = DEVFREQ_MAX_FREQ;
return 0; return 0;
} }
/* Set MAX if we do not know the initial frequency */ /* Set MAX if we do not know the initial frequency */
if (stat->current_frequency == 0) { if (stat->current_frequency == 0) {
*freq = max; *freq = DEVFREQ_MAX_FREQ;
return 0; return 0;
} }
@@ -85,11 +84,6 @@ static int devfreq_simple_ondemand_func(struct devfreq *df,
b = div_u64(b, (dfso_upthreshold - dfso_downdifferential / 2)); b = div_u64(b, (dfso_upthreshold - dfso_downdifferential / 2));
*freq = (unsigned long) b; *freq = (unsigned long) b;
if (df->min_freq && *freq < df->min_freq)
*freq = df->min_freq;
if (df->max_freq && *freq > df->max_freq)
*freq = df->max_freq;
return 0; return 0;
} }

16
drivers/devfreq/governor_userspace.c
View File

@@ -26,19 +26,11 @@ static int devfreq_userspace_func(struct devfreq *df, unsigned long *freq)
{ {
struct userspace_data *data = df->data; struct userspace_data *data = df->data;
if (data->valid) { if (data->valid)
unsigned long adjusted_freq = data->user_frequency; *freq = data->user_frequency;
else
if (df->max_freq && adjusted_freq > df->max_freq)
adjusted_freq = df->max_freq;
if (df->min_freq && adjusted_freq < df->min_freq)
adjusted_freq = df->min_freq;
*freq = adjusted_freq;
} else {
*freq = df->previous_freq; /* No user freq specified yet */ *freq = df->previous_freq; /* No user freq specified yet */
}
return 0; return 0;
} }