soc: qcom: msm_perf: Add support for multi_cycle entry/exit nodes

Add support for multi_enter_cycles/multi_exit_cycles per cluster

There are some usecases which may benefit from different enter/exit
cycle load criteria for multimode cpu load. This change adds support for
that.

Change-Id: I3408405307ca03b9bba3f03e216ef59b98f29832
Signed-off-by: Tapas Kumar Kundu <tkundu@codeaurora.org>

1 files changed, 69 insertions, 40 deletions

diff --git a/include/trace/events/power.h b/include/trace/events/power.h
index 37d28157c0af..be385800f9b4 100644
--- a/include/trace/events/power.h
+++ b/include/trace/events/power.h
@@ -832,11 +832,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)
@@ -844,7 +846,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)
 	),
@@ -855,17 +858,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)
 );
@@ -874,22 +879,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)
@@ -897,8 +908,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)
 	),
@@ -909,58 +922,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 */