microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

cpufreq: governor: rename cur_policy as policy 

Just call it 'policy', cur_policy is unnecessarily long and doesn't
have any special meaning.

Reviewed-by: Preeti U Murthy <preeti@linux.vnet.ibm.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Viresh Kumar 2015-06-19 17:18:05 +05:30 коммит произвёл Rafael J. Wysocki
Родитель 49a9a40c1b
Коммит 42994af63c
4 изменённых файлов: 25 добавлений и 24 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
drivers/cpufreq/cpufreq_conservative.c
Просмотреть файл

@ -47,7 +47,7 @@ static inline unsigned int get_freq_target(struct cs_dbs_tuners *cs_tuners,
static void cs_check_cpu(int cpu, unsigned int load) static void cs_check_cpu(int cpu, unsigned int load)
{ {
struct cs_cpu_dbs_info_s *dbs_info = &per_cpu(cs_cpu_dbs_info, cpu); struct cs_cpu_dbs_info_s *dbs_info = &per_cpu(cs_cpu_dbs_info, cpu);
struct cpufreq_policy *policy = dbs_info->cdbs.cur_policy; struct cpufreq_policy *policy = dbs_info->cdbs.policy;
struct dbs_data *dbs_data = policy->governor_data; struct dbs_data *dbs_data = policy->governor_data;
struct cs_dbs_tuners *cs_tuners = dbs_data->tuners; struct cs_dbs_tuners *cs_tuners = dbs_data->tuners;
@ -106,10 +106,10 @@ static void cs_dbs_timer(struct work_struct *work)
{ {
struct cs_cpu_dbs_info_s *dbs_info = container_of(work, struct cs_cpu_dbs_info_s *dbs_info = container_of(work,
struct cs_cpu_dbs_info_s, cdbs.dwork.work); struct cs_cpu_dbs_info_s, cdbs.dwork.work);
unsigned int cpu = dbs_info->cdbs.cur_policy->cpu; unsigned int cpu = dbs_info->cdbs.policy->cpu;
struct cs_cpu_dbs_info_s *core_dbs_info = &per_cpu(cs_cpu_dbs_info, struct cs_cpu_dbs_info_s *core_dbs_info = &per_cpu(cs_cpu_dbs_info,
cpu); cpu);
struct dbs_data *dbs_data = dbs_info->cdbs.cur_policy->governor_data; struct dbs_data *dbs_data = dbs_info->cdbs.policy->governor_data;
struct cs_dbs_tuners *cs_tuners = dbs_data->tuners; struct cs_dbs_tuners *cs_tuners = dbs_data->tuners;
int delay = delay_for_sampling_rate(cs_tuners->sampling_rate); int delay = delay_for_sampling_rate(cs_tuners->sampling_rate);
bool modify_all = true; bool modify_all = true;
@ -120,7 +120,7 @@ static void cs_dbs_timer(struct work_struct *work)
else else
dbs_check_cpu(dbs_data, cpu); dbs_check_cpu(dbs_data, cpu);
gov_queue_work(dbs_data, dbs_info->cdbs.cur_policy, delay, modify_all); gov_queue_work(dbs_data, dbs_info->cdbs.policy, delay, modify_all);
mutex_unlock(&core_dbs_info->cdbs.timer_mutex); mutex_unlock(&core_dbs_info->cdbs.timer_mutex);
} }
@ -135,7 +135,7 @@ static int dbs_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
if (!dbs_info->enable) if (!dbs_info->enable)
return 0; return 0;
policy = dbs_info->cdbs.cur_policy; policy = dbs_info->cdbs.policy;
/* /*
* we only care if our internally tracked freq moves outside the 'valid' * we only care if our internally tracked freq moves outside the 'valid'

18
drivers/cpufreq/cpufreq_governor.c
Просмотреть файл

@ -60,7 +60,7 @@ void dbs_check_cpu(struct dbs_data *dbs_data, int cpu)
ignore_nice = cs_tuners->ignore_nice_load; ignore_nice = cs_tuners->ignore_nice_load;
} }
policy = cdbs->cur_policy; policy = cdbs->policy;
/* Get Absolute Load */ /* Get Absolute Load */
for_each_cpu(j, policy->cpus) { for_each_cpu(j, policy->cpus) {
@ -211,7 +211,7 @@ static inline void gov_cancel_work(struct dbs_data *dbs_data,
/* Will return if we need to evaluate cpu load again or not */ /* Will return if we need to evaluate cpu load again or not */
bool need_load_eval(struct cpu_dbs_info *cdbs, unsigned int sampling_rate) bool need_load_eval(struct cpu_dbs_info *cdbs, unsigned int sampling_rate)
{ {
if (policy_is_shared(cdbs->cur_policy)) { if (policy_is_shared(cdbs->policy)) {
ktime_t time_now = ktime_get(); ktime_t time_now = ktime_get();
s64 delta_us = ktime_us_delta(time_now, cdbs->time_stamp); s64 delta_us = ktime_us_delta(time_now, cdbs->time_stamp);
@ -352,7 +352,7 @@ static int cpufreq_governor_start(struct cpufreq_policy *policy,
struct cpu_dbs_info *j_cdbs = cdata->get_cpu_cdbs(j); struct cpu_dbs_info *j_cdbs = cdata->get_cpu_cdbs(j);
unsigned int prev_load; unsigned int prev_load;
j_cdbs->cur_policy = policy; j_cdbs->policy = policy;
j_cdbs->prev_cpu_idle = j_cdbs->prev_cpu_idle =
get_cpu_idle_time(j, &j_cdbs->prev_cpu_wall, io_busy); get_cpu_idle_time(j, &j_cdbs->prev_cpu_wall, io_busy);
@ -409,7 +409,7 @@ static void cpufreq_governor_stop(struct cpufreq_policy *policy,
gov_cancel_work(dbs_data, policy); gov_cancel_work(dbs_data, policy);
mutex_destroy(&cdbs->timer_mutex); mutex_destroy(&cdbs->timer_mutex);
cdbs->cur_policy = NULL; cdbs->policy = NULL;
} }
static void cpufreq_governor_limits(struct cpufreq_policy *policy, static void cpufreq_governor_limits(struct cpufreq_policy *policy,
@ -419,15 +419,15 @@ static void cpufreq_governor_limits(struct cpufreq_policy *policy,
unsigned int cpu = policy->cpu; unsigned int cpu = policy->cpu;
struct cpu_dbs_info *cdbs = cdata->get_cpu_cdbs(cpu); struct cpu_dbs_info *cdbs = cdata->get_cpu_cdbs(cpu);
if (!cdbs->cur_policy) if (!cdbs->policy)
return; return;
mutex_lock(&cdbs->timer_mutex); mutex_lock(&cdbs->timer_mutex);
if (policy->max < cdbs->cur_policy->cur) if (policy->max < cdbs->policy->cur)
__cpufreq_driver_target(cdbs->cur_policy, policy->max, __cpufreq_driver_target(cdbs->policy, policy->max,
CPUFREQ_RELATION_H); CPUFREQ_RELATION_H);
else if (policy->min > cdbs->cur_policy->cur) else if (policy->min > cdbs->policy->cur)
__cpufreq_driver_target(cdbs->cur_policy, policy->min, __cpufreq_driver_target(cdbs->policy, policy->min,
CPUFREQ_RELATION_L); CPUFREQ_RELATION_L);
dbs_check_cpu(dbs_data, cpu); dbs_check_cpu(dbs_data, cpu);
mutex_unlock(&cdbs->timer_mutex); mutex_unlock(&cdbs->timer_mutex);

2
drivers/cpufreq/cpufreq_governor.h
Просмотреть файл

@ -140,7 +140,7 @@ struct cpu_dbs_info {
* wake-up from idle. * wake-up from idle.
*/ */
unsigned int prev_load; unsigned int prev_load;
struct cpufreq_policy *cur_policy; struct cpufreq_policy *policy;
struct delayed_work dwork; struct delayed_work dwork;
/* /*
* percpu mutex that serializes governor limit change with gov_dbs_timer * percpu mutex that serializes governor limit change with gov_dbs_timer

17
drivers/cpufreq/cpufreq_ondemand.c
Просмотреть файл

@ -155,7 +155,7 @@ static void dbs_freq_increase(struct cpufreq_policy *policy, unsigned int freq)
static void od_check_cpu(int cpu, unsigned int load) static void od_check_cpu(int cpu, unsigned int load)
{ {
struct od_cpu_dbs_info_s *dbs_info = &per_cpu(od_cpu_dbs_info, cpu); struct od_cpu_dbs_info_s *dbs_info = &per_cpu(od_cpu_dbs_info, cpu);
struct cpufreq_policy *policy = dbs_info->cdbs.cur_policy; struct cpufreq_policy *policy = dbs_info->cdbs.policy;
struct dbs_data *dbs_data = policy->governor_data; struct dbs_data *dbs_data = policy->governor_data;
struct od_dbs_tuners *od_tuners = dbs_data->tuners; struct od_dbs_tuners *od_tuners = dbs_data->tuners;
@ -195,10 +195,10 @@ static void od_dbs_timer(struct work_struct *work)
{ {
struct od_cpu_dbs_info_s *dbs_info = struct od_cpu_dbs_info_s *dbs_info =
container_of(work, struct od_cpu_dbs_info_s, cdbs.dwork.work); container_of(work, struct od_cpu_dbs_info_s, cdbs.dwork.work);
unsigned int cpu = dbs_info->cdbs.cur_policy->cpu; unsigned int cpu = dbs_info->cdbs.policy->cpu;
struct od_cpu_dbs_info_s *core_dbs_info = &per_cpu(od_cpu_dbs_info, struct od_cpu_dbs_info_s *core_dbs_info = &per_cpu(od_cpu_dbs_info,
cpu); cpu);
struct dbs_data *dbs_data = dbs_info->cdbs.cur_policy->governor_data; struct dbs_data *dbs_data = dbs_info->cdbs.policy->governor_data;
struct od_dbs_tuners *od_tuners = dbs_data->tuners; struct od_dbs_tuners *od_tuners = dbs_data->tuners;
int delay = 0, sample_type = core_dbs_info->sample_type; int delay = 0, sample_type = core_dbs_info->sample_type;
bool modify_all = true; bool modify_all = true;
@ -213,8 +213,9 @@ static void od_dbs_timer(struct work_struct *work)
core_dbs_info->sample_type = OD_NORMAL_SAMPLE; core_dbs_info->sample_type = OD_NORMAL_SAMPLE;
if (sample_type == OD_SUB_SAMPLE) { if (sample_type == OD_SUB_SAMPLE) {
delay = core_dbs_info->freq_lo_jiffies; delay = core_dbs_info->freq_lo_jiffies;
__cpufreq_driver_target(core_dbs_info->cdbs.cur_policy, __cpufreq_driver_target(core_dbs_info->cdbs.policy,
core_dbs_info->freq_lo, CPUFREQ_RELATION_H); core_dbs_info->freq_lo,
CPUFREQ_RELATION_H);
} else { } else {
dbs_check_cpu(dbs_data, cpu); dbs_check_cpu(dbs_data, cpu);
if (core_dbs_info->freq_lo) { if (core_dbs_info->freq_lo) {
@ -229,7 +230,7 @@ max_delay:
delay = delay_for_sampling_rate(od_tuners->sampling_rate delay = delay_for_sampling_rate(od_tuners->sampling_rate
* core_dbs_info->rate_mult); * core_dbs_info->rate_mult);
gov_queue_work(dbs_data, dbs_info->cdbs.cur_policy, delay, modify_all); gov_queue_work(dbs_data, dbs_info->cdbs.policy, delay, modify_all);
mutex_unlock(&core_dbs_info->cdbs.timer_mutex); mutex_unlock(&core_dbs_info->cdbs.timer_mutex);
} }
@ -289,7 +290,7 @@ static void update_sampling_rate(struct dbs_data *dbs_data,
cancel_delayed_work_sync(&dbs_info->cdbs.dwork); cancel_delayed_work_sync(&dbs_info->cdbs.dwork);
mutex_lock(&dbs_info->cdbs.timer_mutex); mutex_lock(&dbs_info->cdbs.timer_mutex);
gov_queue_work(dbs_data, dbs_info->cdbs.cur_policy, gov_queue_work(dbs_data, dbs_info->cdbs.policy,
usecs_to_jiffies(new_rate), true); usecs_to_jiffies(new_rate), true);
} }
@ -559,7 +560,7 @@ static void od_set_powersave_bias(unsigned int powersave_bias)
if (cpumask_test_cpu(cpu, &done)) if (cpumask_test_cpu(cpu, &done))
continue; continue;
policy = per_cpu(od_cpu_dbs_info, cpu).cdbs.cur_policy; policy = per_cpu(od_cpu_dbs_info, cpu).cdbs.policy;
if (!policy) if (!policy)
continue; continue;