Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa47efbd authored by Viresh Kumar's avatar Viresh Kumar Committed by Junjie Wu
Browse files

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: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Git-commit: 72a4ce340a7ebf39e1c6fdc8f5feb4f974d6c635
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


[junjiew@codeaurora.org: update non-upstream files]
Signed-off-by: default avatarJunjie Wu <junjiew@codeaurora.org>
parent 4b7d8983

arch/arm/mach-msm/msm_rq_stats.c

+1 −35
Original line number Diff line number Diff line
@@ -55,40 +55,6 @@ struct cpu_load_data { 


static DEFINE_PER_CPU(struct cpu_load_data, cpuload);



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 = jiffies_to_usecs(cur_wall_time);



	return jiffies_to_usecs(idle_time);

}



static inline cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall)

{

	u64 idle_time = get_cpu_idle_time_us(cpu, NULL);



	if (idle_time == -1ULL)

		return get_cpu_idle_time_jiffy(cpu, wall);

	else

		idle_time += get_cpu_iowait_time_us(cpu, wall);



	return idle_time;

}



static inline cputime64_t get_cpu_iowait_time(unsigned int cpu,

							cputime64_t *wall)

{
@@ -108,7 +74,7 @@ static int update_average_load(unsigned int freq, unsigned int cpu) 
	unsigned int idle_time, wall_time, iowait_time;

	unsigned int cur_load, load_at_max_freq;



	cur_idle_time = get_cpu_idle_time(cpu, &cur_wall_time);

	cur_idle_time = get_cpu_idle_time(cpu, &cur_wall_time, 0);

	cur_iowait_time = get_cpu_iowait_time(cpu, &cur_wall_time);



	wall_time = (unsigned int) (cur_wall_time - pcpu->prev_cpu_wall);

drivers/cpufreq/cpufreq.c

+38 −0
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ 


#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <asm/cputime.h>

#include <linux/kernel.h>

#include <linux/kernel_stat.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/notifier.h>
@@ -25,6 +27,7 @@ 
#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/spinlock.h>

#include <linux/tick.h>

#include <linux/device.h>

#include <linux/slab.h>

#include <linux/cpu.h>
@@ -151,6 +154,41 @@ struct kobject *get_governor_parent_kobj(struct cpufreq_policy *policy) 
}

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)

{

	struct cpufreq_policy *data;

drivers/cpufreq/cpufreq_governor.c

+0 −36
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/kernel_stat.h>

#include <linux/mutex.h>

#include <linux/slab.h>

#include <linux/tick.h>

#include <linux/types.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;

}



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)

{

	struct cpu_dbs_common_info *cdbs = dbs_data->cdata->get_cpu_cdbs(cpu);

drivers/cpufreq/cpufreq_governor.h

+0 −1
Original line number Diff line number Diff line
@@ -256,7 +256,6 @@ static ssize_t show_sampling_rate_min_gov_pol \ 
	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);

bool need_load_eval(struct cpu_dbs_common_info *cdbs,

		unsigned int sampling_rate);

drivers/cpufreq/cpufreq_interactive.c

+4 −39
Original line number Diff line number Diff line
@@ -144,42 +144,6 @@ struct cpufreq_governor cpufreq_gov_interactive = { 
	.owner = THIS_MODULE,

};



static inline cputime64_t get_cpu_idle_time_jiffy(unsigned int cpu,

						  cputime64_t *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 = jiffies_to_usecs(cur_wall_time);



	return jiffies_to_usecs(idle_time);

}



static inline cputime64_t get_cpu_idle_time(unsigned int cpu,

					    cputime64_t *wall)

{

	u64 idle_time = get_cpu_idle_time_us(cpu, wall);



	if (idle_time == -1ULL)

		idle_time = get_cpu_idle_time_jiffy(cpu, wall);

	else if (!io_is_busy)

		idle_time += get_cpu_iowait_time_us(cpu, wall);



	return idle_time;

}



static void cpufreq_interactive_timer_resched(

	struct cpufreq_interactive_cpuinfo *pcpu)

{
@@ -189,7 +153,7 @@ static void cpufreq_interactive_timer_resched( 
	spin_lock_irqsave(&pcpu->load_lock, flags);

	pcpu->time_in_idle =

		get_cpu_idle_time(smp_processor_id(),

				     &pcpu->time_in_idle_timestamp);

				  &pcpu->time_in_idle_timestamp, io_is_busy);

	pcpu->cputime_speedadj = 0;

	pcpu->cputime_speedadj_timestamp = pcpu->time_in_idle_timestamp;

	expires = jiffies + usecs_to_jiffies(timer_rate);
@@ -223,7 +187,8 @@ static void cpufreq_interactive_timer_start(int cpu) 


	spin_lock_irqsave(&pcpu->load_lock, flags);

	pcpu->time_in_idle =

		get_cpu_idle_time(cpu, &pcpu->time_in_idle_timestamp);

		get_cpu_idle_time(cpu, &pcpu->time_in_idle_timestamp,

				  io_is_busy);

	pcpu->cputime_speedadj = 0;

	pcpu->cputime_speedadj_timestamp = pcpu->time_in_idle_timestamp;

	spin_unlock_irqrestore(&pcpu->load_lock, flags);
@@ -364,7 +329,7 @@ static u64 update_load(int cpu) 
	unsigned int delta_time;

	u64 active_time;



	now_idle = get_cpu_idle_time(cpu, &now);

	now_idle = get_cpu_idle_time(cpu, &now, io_is_busy);

	delta_idle = (unsigned int)(now_idle - pcpu->time_in_idle);

	delta_time = (unsigned int)(now - pcpu->time_in_idle_timestamp);