cpufreq: Move get_cpu_idle_time() to cpufreq.c
Governors other than ondemand and conservative can also use get_cpu_idle_time() and they aren't required to compile cpufreq_governor.c. So, move these independent routines to cpufreq.c instead. 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:
parent
944e9a0316
commit
72a4ce340a
|
@ -17,7 +17,9 @@
|
||||||
|
|
||||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||||
|
|
||||||
|
#include <asm/cputime.h>
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
|
#include <linux/kernel_stat.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/notifier.h>
|
#include <linux/notifier.h>
|
||||||
|
@ -25,6 +27,7 @@
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
#include <linux/spinlock.h>
|
#include <linux/spinlock.h>
|
||||||
|
#include <linux/tick.h>
|
||||||
#include <linux/device.h>
|
#include <linux/device.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/cpu.h>
|
#include <linux/cpu.h>
|
||||||
|
@ -143,6 +146,41 @@ struct kobject *get_governor_parent_kobj(struct cpufreq_policy *policy)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(get_governor_parent_kobj);
|
EXPORT_SYMBOL_GPL(get_governor_parent_kobj);
|
||||||
|
|
||||||
|
static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall)
|
||||||
|
{
|
||||||
|
u64 idle_time;
|
||||||
|
u64 cur_wall_time;
|
||||||
|
u64 busy_time;
|
||||||
|
|
||||||
|
cur_wall_time = jiffies64_to_cputime64(get_jiffies_64());
|
||||||
|
|
||||||
|
busy_time = kcpustat_cpu(cpu).cpustat[CPUTIME_USER];
|
||||||
|
busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM];
|
||||||
|
busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_IRQ];
|
||||||
|
busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SOFTIRQ];
|
||||||
|
busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_STEAL];
|
||||||
|
busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_NICE];
|
||||||
|
|
||||||
|
idle_time = cur_wall_time - busy_time;
|
||||||
|
if (wall)
|
||||||
|
*wall = cputime_to_usecs(cur_wall_time);
|
||||||
|
|
||||||
|
return cputime_to_usecs(idle_time);
|
||||||
|
}
|
||||||
|
|
||||||
|
u64 get_cpu_idle_time(unsigned int cpu, u64 *wall, int io_busy)
|
||||||
|
{
|
||||||
|
u64 idle_time = get_cpu_idle_time_us(cpu, io_busy ? wall : NULL);
|
||||||
|
|
||||||
|
if (idle_time == -1ULL)
|
||||||
|
return get_cpu_idle_time_jiffy(cpu, wall);
|
||||||
|
else if (!io_busy)
|
||||||
|
idle_time += get_cpu_iowait_time_us(cpu, wall);
|
||||||
|
|
||||||
|
return idle_time;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(get_cpu_idle_time);
|
||||||
|
|
||||||
static struct cpufreq_policy *__cpufreq_cpu_get(unsigned int cpu, bool sysfs)
|
static struct cpufreq_policy *__cpufreq_cpu_get(unsigned int cpu, bool sysfs)
|
||||||
{
|
{
|
||||||
struct cpufreq_policy *data;
|
struct cpufreq_policy *data;
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
#include <linux/kernel_stat.h>
|
#include <linux/kernel_stat.h>
|
||||||
#include <linux/mutex.h>
|
#include <linux/mutex.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/tick.h>
|
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/workqueue.h>
|
#include <linux/workqueue.h>
|
||||||
|
|
||||||
|
@ -37,41 +36,6 @@ static struct attribute_group *get_sysfs_attr(struct dbs_data *dbs_data)
|
||||||
return dbs_data->cdata->attr_group_gov_sys;
|
return dbs_data->cdata->attr_group_gov_sys;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall)
|
|
||||||
{
|
|
||||||
u64 idle_time;
|
|
||||||
u64 cur_wall_time;
|
|
||||||
u64 busy_time;
|
|
||||||
|
|
||||||
cur_wall_time = jiffies64_to_cputime64(get_jiffies_64());
|
|
||||||
|
|
||||||
busy_time = kcpustat_cpu(cpu).cpustat[CPUTIME_USER];
|
|
||||||
busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM];
|
|
||||||
busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_IRQ];
|
|
||||||
busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SOFTIRQ];
|
|
||||||
busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_STEAL];
|
|
||||||
busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_NICE];
|
|
||||||
|
|
||||||
idle_time = cur_wall_time - busy_time;
|
|
||||||
if (wall)
|
|
||||||
*wall = cputime_to_usecs(cur_wall_time);
|
|
||||||
|
|
||||||
return cputime_to_usecs(idle_time);
|
|
||||||
}
|
|
||||||
|
|
||||||
u64 get_cpu_idle_time(unsigned int cpu, u64 *wall, int io_busy)
|
|
||||||
{
|
|
||||||
u64 idle_time = get_cpu_idle_time_us(cpu, io_busy ? wall : NULL);
|
|
||||||
|
|
||||||
if (idle_time == -1ULL)
|
|
||||||
return get_cpu_idle_time_jiffy(cpu, wall);
|
|
||||||
else if (!io_busy)
|
|
||||||
idle_time += get_cpu_iowait_time_us(cpu, wall);
|
|
||||||
|
|
||||||
return idle_time;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL_GPL(get_cpu_idle_time);
|
|
||||||
|
|
||||||
void dbs_check_cpu(struct dbs_data *dbs_data, int cpu)
|
void dbs_check_cpu(struct dbs_data *dbs_data, int cpu)
|
||||||
{
|
{
|
||||||
struct cpu_dbs_common_info *cdbs = dbs_data->cdata->get_cpu_cdbs(cpu);
|
struct cpu_dbs_common_info *cdbs = dbs_data->cdata->get_cpu_cdbs(cpu);
|
||||||
|
|
|
@ -256,7 +256,6 @@ static ssize_t show_sampling_rate_min_gov_pol \
|
||||||
return sprintf(buf, "%u\n", dbs_data->min_sampling_rate); \
|
return sprintf(buf, "%u\n", dbs_data->min_sampling_rate); \
|
||||||
}
|
}
|
||||||
|
|
||||||
u64 get_cpu_idle_time(unsigned int cpu, u64 *wall, int io_busy);
|
|
||||||
void dbs_check_cpu(struct dbs_data *dbs_data, int cpu);
|
void dbs_check_cpu(struct dbs_data *dbs_data, int cpu);
|
||||||
bool need_load_eval(struct cpu_dbs_common_info *cdbs,
|
bool need_load_eval(struct cpu_dbs_common_info *cdbs,
|
||||||
unsigned int sampling_rate);
|
unsigned int sampling_rate);
|
||||||
|
|
|
@ -337,6 +337,7 @@ const char *cpufreq_get_current_driver(void);
|
||||||
/*********************************************************************
|
/*********************************************************************
|
||||||
* CPUFREQ 2.6. INTERFACE *
|
* CPUFREQ 2.6. INTERFACE *
|
||||||
*********************************************************************/
|
*********************************************************************/
|
||||||
|
u64 get_cpu_idle_time(unsigned int cpu, u64 *wall, int io_busy);
|
||||||
int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu);
|
int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu);
|
||||||
int cpufreq_update_policy(unsigned int cpu);
|
int cpufreq_update_policy(unsigned int cpu);
|
||||||
bool have_governor_per_policy(void);
|
bool have_governor_per_policy(void);
|
||||||
|
|
Loading…
Reference in a new issue