p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpufreq: governor: Add a ->start callback for governors 

To avoid having to check the governor type explicitly in the common
code in order to initialize data structures specific to the governor
type properly, add a ->start callback to struct dbs_governor and
use it to initialize those data structures for the ondemand and
conservative governors.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
This commit is contained in:
Rafael J. Wysocki 2016-02-18 02:21:21 +01:00
parent 8847e038c1
commit 702c9e542a
4 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/cpufreq/cpufreq_conservative.c
View File

@ -279,6 +279,14 @@ static void cs_exit(struct dbs_data *dbs_data, bool notify)
kfree(dbs_data->tuners); kfree(dbs_data->tuners);
} }
static void cs_start(struct cpufreq_policy *policy)
{
struct cs_cpu_dbs_info_s *dbs_info = &per_cpu(cs_cpu_dbs_info, policy->cpu);
dbs_info->down_skip = 0;
dbs_info->requested_freq = policy->cur;
}
define_get_cpu_dbs_routines(cs_cpu_dbs_info); define_get_cpu_dbs_routines(cs_cpu_dbs_info);
static struct dbs_governor cs_dbs_gov = { static struct dbs_governor cs_dbs_gov = {
@ -295,6 +303,7 @@ static struct dbs_governor cs_dbs_gov = {
.gov_dbs_timer = cs_dbs_timer, .gov_dbs_timer = cs_dbs_timer,
.init = cs_init, .init = cs_init,
.exit = cs_exit, .exit = cs_exit,
.start = cs_start,
}; };
#define CPU_FREQ_GOV_CONSERVATIVE (&cs_dbs_gov.gov) #define CPU_FREQ_GOV_CONSERVATIVE (&cs_dbs_gov.gov)

16
drivers/cpufreq/cpufreq_governor.c
View File

@ -517,7 +517,7 @@ static int cpufreq_governor_start(struct cpufreq_policy *policy)
struct dbs_governor *gov = dbs_governor_of(policy); struct dbs_governor *gov = dbs_governor_of(policy);
struct policy_dbs_info *policy_dbs = policy->governor_data; struct policy_dbs_info *policy_dbs = policy->governor_data;
struct dbs_data *dbs_data = policy_dbs->dbs_data; struct dbs_data *dbs_data = policy_dbs->dbs_data;
unsigned int sampling_rate, ignore_nice, j, cpu = policy->cpu; unsigned int sampling_rate, ignore_nice, j;
unsigned int io_busy; unsigned int io_busy;
if (!policy->cur) if (!policy->cur)
@ -543,19 +543,7 @@ static int cpufreq_governor_start(struct cpufreq_policy *policy)
j_cdbs->prev_cpu_nice = kcpustat_cpu(j).cpustat[CPUTIME_NICE]; j_cdbs->prev_cpu_nice = kcpustat_cpu(j).cpustat[CPUTIME_NICE];
} }
if (gov->governor == GOV_CONSERVATIVE) { gov->start(policy);
struct cs_cpu_dbs_info_s *cs_dbs_info =
gov->get_cpu_dbs_info_s(cpu);
cs_dbs_info->down_skip = 0;
cs_dbs_info->requested_freq = policy->cur;
} else {
struct od_ops *od_ops = gov->gov_ops;
struct od_cpu_dbs_info_s *od_dbs_info = gov->get_cpu_dbs_info_s(cpu);
od_dbs_info->sample_type = OD_NORMAL_SAMPLE;
od_ops->powersave_bias_init_cpu(cpu);
}
gov_set_update_util(policy_dbs, sampling_rate); gov_set_update_util(policy_dbs, sampling_rate);
return 0; return 0;

1
drivers/cpufreq/cpufreq_governor.h
View File

@ -205,6 +205,7 @@ struct dbs_governor {
unsigned int (*gov_dbs_timer)(struct cpufreq_policy *policy); unsigned int (*gov_dbs_timer)(struct cpufreq_policy *policy);
int (*init)(struct dbs_data *dbs_data, bool notify); int (*init)(struct dbs_data *dbs_data, bool notify);
void (*exit)(struct dbs_data *dbs_data, bool notify); void (*exit)(struct dbs_data *dbs_data, bool notify);
void (*start)(struct cpufreq_policy *policy);
/* Governor specific ops, see below */ /* Governor specific ops, see below */
void *gov_ops; void *gov_ops;

10
drivers/cpufreq/cpufreq_ondemand.c
View File

@ -410,6 +410,15 @@ static void od_exit(struct dbs_data *dbs_data, bool notify)
kfree(dbs_data->tuners); kfree(dbs_data->tuners);
} }
static void od_start(struct cpufreq_policy *policy)
{
unsigned int cpu = policy->cpu;
struct od_cpu_dbs_info_s *dbs_info = &per_cpu(od_cpu_dbs_info, cpu);
dbs_info->sample_type = OD_NORMAL_SAMPLE;
od_ops.powersave_bias_init_cpu(cpu);
}
define_get_cpu_dbs_routines(od_cpu_dbs_info); define_get_cpu_dbs_routines(od_cpu_dbs_info);
static struct od_ops od_ops = { static struct od_ops od_ops = {
@ -432,6 +441,7 @@ static struct dbs_governor od_dbs_gov = {
.gov_ops = &od_ops, .gov_ops = &od_ops,
.init = od_init, .init = od_init,
.exit = od_exit, .exit = od_exit,
.start = od_start,
}; };
#define CPU_FREQ_GOV_ONDEMAND (&od_dbs_gov.gov) #define CPU_FREQ_GOV_ONDEMAND (&od_dbs_gov.gov)