Merge "soc: qcom: msm_perf: Add support for multi_cycle entry/exit nodes" (c1167ddf) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/soc/qcom/msm_performance.c

+94 −28

Original line number	Diff line number	Diff line
		@@ -48,7 +48,8 @@ struct cluster {
		u64 last_mode_check_ts;
		unsigned int single_enter_cycle_cnt;
		unsigned int single_exit_cycle_cnt;
		unsigned int multi_cycle_cnt;
		unsigned int multi_enter_cycle_cnt;
		unsigned int multi_exit_cycle_cnt;
		spinlock_t mode_lock;
		/* Tunables */
		unsigned int single_enter_load;
		@@ -57,7 +58,8 @@ struct cluster {
		unsigned int pcpu_multi_exit_load;
		unsigned int single_enter_cycles;
		unsigned int single_exit_cycles;
		unsigned int multi_cycles;
		unsigned int multi_enter_cycles;
		unsigned int multi_exit_cycles;
		spinlock_t timer_lock;
		unsigned int timer_rate;
		struct timer_list mode_exit_timer;
		@@ -119,7 +121,8 @@ static struct task_struct *notify_thread;
		#define DEF_PCPU_MULTI_EX 50
		#define DEF_SINGLE_ENTER_CYCLE 4
		#define DEF_SINGLE_EXIT_CYCLE 4
		#define DEF_MULTI_CYCLE 4
		#define DEF_MULTI_ENTER_CYCLE 4
		#define DEF_MULTI_EXIT_CYCLE 4
		#define LAST_LD_CHECK_TOL (2 * USEC_PER_MSEC)

		/************************sysfs start******************************/
		@@ -790,7 +793,8 @@ static const struct kernel_param_ops param_ops_single_exit_cycles = {
		};
		device_param_cb(single_exit_cycles, &param_ops_single_exit_cycles, NULL, 0644);

		static int set_multi_cycles(const char buf, const struct kernel_param kp)
		static int set_multi_enter_cycles(const char *buf,
		const struct kernel_param *kp)
		{
		unsigned int val, i, ntokens = 0;
		const char *cp = buf;
		@@ -811,7 +815,7 @@ static int set_multi_cycles(const char buf, const struct kernel_param kp)
		if (sscanf(cp, "%u\n", &val) != 1)
		return -EINVAL;

		managed_clusters[i]->multi_cycles = val;
		managed_clusters[i]->multi_enter_cycles = val;

		bytes_left = PAGE_SIZE - (cp - buf);
		cp = strnchr(cp, bytes_left, ':');
		@@ -821,7 +825,7 @@ static int set_multi_cycles(const char buf, const struct kernel_param kp)
		return 0;
		}

		static int get_multi_cycles(char buf, const struct kernel_param kp)
		static int get_multi_enter_cycles(char buf, const struct kernel_param kp)
		{
		int i, cnt = 0;

		@@ -830,17 +834,69 @@ static int get_multi_cycles(char buf, const struct kernel_param kp)

		for (i = 0; i < num_clusters; i++)
		cnt += snprintf(buf + cnt, PAGE_SIZE - cnt,
		"%u:", managed_clusters[i]->multi_cycles);
		"%u:", managed_clusters[i]->multi_enter_cycles);
		cnt--;
		cnt += snprintf(buf + cnt, PAGE_SIZE - cnt, " ");
		return cnt;
		}

		static const struct kernel_param_ops param_ops_multi_cycles = {
		.set = set_multi_cycles,
		.get = get_multi_cycles,
		static const struct kernel_param_ops param_ops_multi_enter_cycles = {
		.set = set_multi_enter_cycles,
		.get = get_multi_enter_cycles,
		};
		device_param_cb(multi_cycles, &param_ops_multi_cycles, NULL, 0644);
		device_param_cb(multi_enter_cycles, &param_ops_multi_enter_cycles, NULL, 0644);

		static int set_multi_exit_cycles(const char buf, const struct kernel_param kp)
		{
		unsigned int val, i, ntokens = 0;
		const char *cp = buf;
		unsigned int bytes_left;

		if (!clusters_inited)
		return -EINVAL;

		while ((cp = strpbrk(cp + 1, ":")))
		ntokens++;

		if (ntokens != (num_clusters - 1))
		return -EINVAL;

		cp = buf;
		for (i = 0; i < num_clusters; i++) {

		if (sscanf(cp, "%u\n", &val) != 1)
		return -EINVAL;

		managed_clusters[i]->multi_exit_cycles = val;

		bytes_left = PAGE_SIZE - (cp - buf);
		cp = strnchr(cp, bytes_left, ':');
		cp++;
		}

		return 0;
		}

		static int get_multi_exit_cycles(char buf, const struct kernel_param kp)
		{
		int i, cnt = 0;

		if (!clusters_inited)
		return cnt;

		for (i = 0; i < num_clusters; i++)
		cnt += snprintf(buf + cnt, PAGE_SIZE - cnt,
		"%u:", managed_clusters[i]->multi_exit_cycles);
		cnt--;
		cnt += snprintf(buf + cnt, PAGE_SIZE - cnt, " ");
		return cnt;
		}

		static const struct kernel_param_ops param_ops_multi_exit_cycles = {
		.set = set_multi_exit_cycles,
		.get = get_multi_exit_cycles,
		};
		device_param_cb(multi_exit_cycles, &param_ops_multi_exit_cycles, NULL, 0644);

		static int set_io_enter_cycles(const char buf, const struct kernel_param kp)
		{
		@@ -949,7 +1005,8 @@ static int set_workload_detect(const char buf, const struct kernel_param kp)
		spin_lock_irqsave(&i_cl->mode_lock, flags);
		i_cl->single_enter_cycle_cnt = 0;
		i_cl->single_exit_cycle_cnt = 0;
		i_cl->multi_cycle_cnt = 0;
		i_cl->multi_enter_cycle_cnt = 0;
		i_cl->multi_exit_cycle_cnt = 0;
		i_cl->mode = 0;
		i_cl->mode_change = true;
		spin_unlock_irqrestore(&i_cl->mode_lock, flags);
		@@ -1170,8 +1227,9 @@ static void disable_timer(struct cluster *cl)
		trace_single_cycle_exit_timer_stop(cpumask_first(cl->cpus),
		cl->single_enter_cycles, cl->single_enter_cycle_cnt,
		cl->single_exit_cycles, cl->single_exit_cycle_cnt,
		cl->multi_cycles, cl->multi_cycle_cnt, cl->timer_rate,
		cl->mode);
		cl->multi_enter_cycles, cl->multi_enter_cycle_cnt,
		cl->multi_exit_cycles, cl->multi_exit_cycle_cnt,
		cl->timer_rate, cl->mode);
		}

		spin_unlock_irqrestore(&cl->timer_lock, flags);
		@@ -1191,8 +1249,9 @@ static void start_timer(struct cluster *cl)
		trace_single_cycle_exit_timer_start(cpumask_first(cl->cpus),
		cl->single_enter_cycles, cl->single_enter_cycle_cnt,
		cl->single_exit_cycles, cl->single_exit_cycle_cnt,
		cl->multi_cycles, cl->multi_cycle_cnt, cl->timer_rate,
		cl->mode);
		cl->multi_enter_cycles, cl->multi_enter_cycle_cnt,
		cl->multi_exit_cycles, cl->multi_exit_cycle_cnt,
		cl->timer_rate, cl->mode);
		}
		spin_unlock_irqrestore(&cl->timer_lock, flags);
		}
		@@ -1262,19 +1321,25 @@ static void check_cpu_load(struct cluster *cl, u64 now)

		if (!(cl->mode & MULTI)) {
		if (total_load >= total_load_ceil) {
		cl->multi_cycle_cnt++;
		if (cl->multi_cycle_cnt >= cl->multi_cycles)
		cl->multi_enter_cycle_cnt++;
		if (cl->multi_enter_cycle_cnt
		>= cl->multi_enter_cycles) {
		ret_mode \|= MULTI;
		cl->multi_enter_cycle_cnt = 0;
		}
		} else {
		cl->multi_cycle_cnt = 0;
		cl->multi_enter_cycle_cnt = 0;
		}
		} else {
		if (total_load < total_load_floor) {
		cl->multi_cycle_cnt--;
		if (!cl->multi_cycle_cnt)
		cl->multi_exit_cycle_cnt++;
		if (cl->multi_exit_cycle_cnt
		>= cl->multi_exit_cycles) {
		ret_mode &= ~MULTI;
		cl->multi_exit_cycle_cnt = 0;
		}
		} else {
		cl->multi_cycle_cnt = cl->multi_cycles;
		cl->multi_exit_cycle_cnt = 0;
		}
		}

		@@ -1288,8 +1353,8 @@ static void check_cpu_load(struct cluster *cl, u64 now)

		trace_cpu_mode_detect(cpumask_first(cl->cpus), max_load,
		cl->single_enter_cycle_cnt, cl->single_exit_cycle_cnt,
		total_load, cl->multi_cycle_cnt,
		cl->mode, cpu_cnt);
		total_load, cl->multi_enter_cycle_cnt,
		cl->multi_exit_cycle_cnt, cl->mode, cpu_cnt);

		spin_unlock_irqrestore(&cl->mode_lock, flags);

		@@ -1616,10 +1681,10 @@ static void single_mod_exit_timer(unsigned long data)
		i_cl->single_enter_cycle_cnt = 0;
		i_cl->single_exit_cycle_cnt = 0;
		trace_single_mode_timeout(cpumask_first(i_cl->cpus),
		i_cl->single_enter_cycles,
		i_cl->single_enter_cycle_cnt,
		i_cl->single_enter_cycles, i_cl->single_enter_cycle_cnt,
		i_cl->single_exit_cycles, i_cl->single_exit_cycle_cnt,
		i_cl->multi_cycles, i_cl->multi_cycle_cnt,
		i_cl->multi_enter_cycles, i_cl->multi_enter_cycle_cnt,
		i_cl->multi_exit_cycles, i_cl->multi_exit_cycle_cnt,
		i_cl->timer_rate, i_cl->mode);
		}
		spin_unlock_irqrestore(&i_cl->mode_lock, flags);
		@@ -1651,7 +1716,8 @@ static int init_cluster_control(void)
		managed_clusters[i]->pcpu_multi_enter_load
		= DEF_PCPU_MULTI_ENT;
		managed_clusters[i]->pcpu_multi_exit_load = DEF_PCPU_MULTI_EX;
		managed_clusters[i]->multi_cycles = DEF_MULTI_CYCLE;
		managed_clusters[i]->multi_enter_cycles = DEF_MULTI_ENTER_CYCLE;
		managed_clusters[i]->multi_exit_cycles = DEF_MULTI_EXIT_CYCLE;

		spin_lock_init(&(managed_clusters[i]->iowait_lock));
		spin_lock_init(&(managed_clusters[i]->mode_lock));

include/trace/events/power.h

+69 −40

Original line number	Diff line number	Diff line
		@@ -705,11 +705,13 @@ DECLARE_EVENT_CLASS(cpu_modes,
		TP_PROTO(unsigned int cpu, unsigned int max_load,
		unsigned int single_enter_cycle_cnt,
		unsigned int single_exit_cycle_cnt,
		unsigned int total_load, unsigned int multi_cycles,
		unsigned int mode, unsigned int cpu_cnt),
		unsigned int total_load, unsigned int multi_enter_cycle_cnt,
		unsigned int multi_exit_cycle_cnt, unsigned int mode,
		unsigned int cpu_cnt),

		TP_ARGS(cpu, max_load, single_enter_cycle_cnt, single_exit_cycle_cnt,
		total_load, multi_cycles, mode, cpu_cnt),
		total_load, multi_enter_cycle_cnt, multi_exit_cycle_cnt, mode,
		cpu_cnt),

		TP_STRUCT__entry(
		__field(u32, cpu)
		@@ -717,7 +719,8 @@ DECLARE_EVENT_CLASS(cpu_modes,
		__field(u32, single_enter_cycle_cnt)
		__field(u32, single_exit_cycle_cnt)
		__field(u32, total_load)
		__field(u32, multi_cycles)
		__field(u32, multi_enter_cycle_cnt)
		__field(u32, multi_exit_cycle_cnt)
		__field(u32, mode)
		__field(u32, cpu_cnt)
		),
		@@ -728,17 +731,19 @@ DECLARE_EVENT_CLASS(cpu_modes,
		__entry->single_enter_cycle_cnt = single_enter_cycle_cnt;
		__entry->single_exit_cycle_cnt = single_exit_cycle_cnt;
		__entry->total_load = total_load;
		__entry->multi_cycles = multi_cycles;
		__entry->multi_enter_cycle_cnt = multi_enter_cycle_cnt;
		__entry->multi_exit_cycle_cnt = multi_exit_cycle_cnt;
		__entry->mode = mode;
		__entry->cpu_cnt = cpu_cnt;
		),

		TP_printk("%u:%4u:%4u:%4u:%4u:%4u:%4u:%u",
		TP_printk("%u:%4u:%4u:%4u:%4u:%4u:%4u:%4u:%u",
		(unsigned int)__entry->cpu, (unsigned int)__entry->max_load,
		(unsigned int)__entry->single_enter_cycle_cnt,
		(unsigned int)__entry->single_exit_cycle_cnt,
		(unsigned int)__entry->total_load,
		(unsigned int)__entry->multi_cycles,
		(unsigned int)__entry->multi_enter_cycle_cnt,
		(unsigned int)__entry->multi_exit_cycle_cnt,
		(unsigned int)__entry->mode,
		(unsigned int)__entry->cpu_cnt)
		);
		@@ -747,22 +752,28 @@ DEFINE_EVENT(cpu_modes, cpu_mode_detect,
		TP_PROTO(unsigned int cpu, unsigned int max_load,
		unsigned int single_enter_cycle_cnt,
		unsigned int single_exit_cycle_cnt,
		unsigned int total_load, unsigned int multi_cycles,
		unsigned int mode, unsigned int cpu_cnt),
		unsigned int total_load, unsigned int multi_enter_cycle_cnt,
		unsigned int multi_exit_cycle_cnt, unsigned int mode,
		unsigned int cpu_cnt),
		TP_ARGS(cpu, max_load, single_enter_cycle_cnt, single_exit_cycle_cnt,
		total_load, multi_cycles, mode, cpu_cnt)
		total_load, multi_enter_cycle_cnt, multi_exit_cycle_cnt,
		mode, cpu_cnt)
		);

		DECLARE_EVENT_CLASS(timer_status,
		TP_PROTO(unsigned int cpu, unsigned int single_enter_cycles,
		unsigned int single_enter_cycle_cnt,
		unsigned int single_exit_cycles,
		unsigned int single_exit_cycle_cnt, unsigned int multi_cycles,
		unsigned int multi_cycle_cnt, unsigned int timer_rate,
		unsigned int single_exit_cycle_cnt,
		unsigned int multi_enter_cycles,
		unsigned int multi_enter_cycle_cnt,
		unsigned int multi_exit_cycles,
		unsigned int multi_exit_cycle_cnt, unsigned int timer_rate,
		unsigned int mode),
		TP_ARGS(cpu, single_enter_cycles, single_enter_cycle_cnt,
		single_exit_cycles, single_exit_cycle_cnt, multi_cycles,
		multi_cycle_cnt, timer_rate, mode),
		single_exit_cycles, single_exit_cycle_cnt, multi_enter_cycles,
		multi_enter_cycle_cnt, multi_exit_cycles,
		multi_exit_cycle_cnt, timer_rate, mode),

		TP_STRUCT__entry(
		__field(unsigned int, cpu)
		@@ -770,8 +781,10 @@ DECLARE_EVENT_CLASS(timer_status,
		__field(unsigned int, single_enter_cycle_cnt)
		__field(unsigned int, single_exit_cycles)
		__field(unsigned int, single_exit_cycle_cnt)
		__field(unsigned int, multi_cycles)
		__field(unsigned int, multi_cycle_cnt)
		__field(unsigned int, multi_enter_cycles)
		__field(unsigned int, multi_enter_cycle_cnt)
		__field(unsigned int, multi_exit_cycles)
		__field(unsigned int, multi_exit_cycle_cnt)
		__field(unsigned int, timer_rate)
		__field(unsigned int, mode)
		),
		@@ -782,58 +795,74 @@ DECLARE_EVENT_CLASS(timer_status,
		__entry->single_enter_cycle_cnt = single_enter_cycle_cnt;
		__entry->single_exit_cycles = single_exit_cycles;
		__entry->single_exit_cycle_cnt = single_exit_cycle_cnt;
		__entry->multi_cycles = multi_cycles;
		__entry->multi_cycle_cnt = multi_cycle_cnt;
		__entry->multi_enter_cycles = multi_enter_cycles;
		__entry->multi_enter_cycle_cnt = multi_enter_cycle_cnt;
		__entry->multi_exit_cycles = multi_exit_cycles;
		__entry->multi_exit_cycle_cnt = multi_exit_cycle_cnt;
		__entry->timer_rate = timer_rate;
		__entry->mode = mode;
		),

		TP_printk("%u:%4u:%4u:%4u:%4u:%4u:%4u:%4u:%4u",
		__entry->cpu,
		__entry->single_enter_cycles,
		__entry->single_enter_cycle_cnt,
		__entry->single_exit_cycles,
		__entry->single_exit_cycle_cnt,
		__entry->multi_cycles,
		__entry->multi_cycle_cnt,
		__entry->timer_rate,
		__entry->mode)
		TP_printk("%u:%4u:%4u:%4u:%4u:%4u:%4u:%4u:%4u:%4u:%4u",
		(unsigned int) __entry->cpu,
		(unsigned int) __entry->single_enter_cycles,
		(unsigned int) __entry->single_enter_cycle_cnt,
		(unsigned int) __entry->single_exit_cycles,
		(unsigned int) __entry->single_exit_cycle_cnt,
		(unsigned int) __entry->multi_enter_cycles,
		(unsigned int) __entry->multi_enter_cycle_cnt,
		(unsigned int) __entry->multi_exit_cycles,
		(unsigned int) __entry->multi_exit_cycle_cnt,
		(unsigned int) __entry->timer_rate,
		(unsigned int) __entry->mode)
		);

		DEFINE_EVENT(timer_status, single_mode_timeout,
		TP_PROTO(unsigned int cpu, unsigned int single_enter_cycles,
		unsigned int single_enter_cycle_cnt,
		unsigned int single_exit_cycles,
		unsigned int single_exit_cycle_cnt, unsigned int multi_cycles,
		unsigned int multi_cycle_cnt, unsigned int timer_rate,
		unsigned int single_exit_cycle_cnt,
		unsigned int multi_enter_cycles,
		unsigned int multi_enter_cycle_cnt,
		unsigned int multi_exit_cycles,
		unsigned int multi_exit_cycle_cnt, unsigned int timer_rate,
		unsigned int mode),
		TP_ARGS(cpu, single_enter_cycles, single_enter_cycle_cnt,
		single_exit_cycles, single_exit_cycle_cnt, multi_cycles,
		multi_cycle_cnt, timer_rate, mode)
		single_exit_cycles, single_exit_cycle_cnt, multi_enter_cycles,
		multi_enter_cycle_cnt, multi_exit_cycles, multi_exit_cycle_cnt,
		timer_rate, mode)
		);

		DEFINE_EVENT(timer_status, single_cycle_exit_timer_start,
		TP_PROTO(unsigned int cpu, unsigned int single_enter_cycles,
		unsigned int single_enter_cycle_cnt,
		unsigned int single_exit_cycles,
		unsigned int single_exit_cycle_cnt, unsigned int multi_cycles,
		unsigned int multi_cycle_cnt, unsigned int timer_rate,
		unsigned int single_exit_cycle_cnt,
		unsigned int multi_enter_cycles,
		unsigned int multi_enter_cycle_cnt,
		unsigned int multi_exit_cycles,
		unsigned int multi_exit_cycle_cnt, unsigned int timer_rate,
		unsigned int mode),
		TP_ARGS(cpu, single_enter_cycles, single_enter_cycle_cnt,
		single_exit_cycles, single_exit_cycle_cnt, multi_cycles,
		multi_cycle_cnt, timer_rate, mode)
		single_exit_cycles, single_exit_cycle_cnt, multi_enter_cycles,
		multi_enter_cycle_cnt, multi_exit_cycles, multi_exit_cycle_cnt,
		timer_rate, mode)
		);

		DEFINE_EVENT(timer_status, single_cycle_exit_timer_stop,
		TP_PROTO(unsigned int cpu, unsigned int single_enter_cycles,
		unsigned int single_enter_cycle_cnt,
		unsigned int single_exit_cycles,
		unsigned int single_exit_cycle_cnt, unsigned int multi_cycles,
		unsigned int multi_cycle_cnt, unsigned int timer_rate,
		unsigned int single_exit_cycle_cnt,
		unsigned int multi_enter_cycles,
		unsigned int multi_enter_cycle_cnt,
		unsigned int multi_exit_cycles,
		unsigned int multi_exit_cycle_cnt, unsigned int timer_rate,
		unsigned int mode),
		TP_ARGS(cpu, single_enter_cycles, single_enter_cycle_cnt,
		single_exit_cycles, single_exit_cycle_cnt, multi_cycles,
		multi_cycle_cnt, timer_rate, mode)
		single_exit_cycles, single_exit_cycle_cnt, multi_enter_cycles,
		multi_enter_cycle_cnt, multi_exit_cycles, multi_exit_cycle_cnt,
		timer_rate, mode)
		);

		#endif /* _TRACE_POWER_H */