xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: sched: cpufreq_schedutil: move sugov traces to sched"

Browse Source 
This reverts commit a68d66b29e.

Signed-off-by: Quentin Perret <qperret@google.com>
Change-Id: Ic8be3d2484d38b9c2f62d518980dcfef8cdb2c87
This commit is contained in:
Quentin Perret
2021-03-16 09:16:45 +00:00
parent cc574f0d36
commit 27d6dac0df
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/trace/events/power.h
View File

@@ -500,6 +500,15 @@ DEFINE_EVENT(dev_pm_qos_request, dev_pm_qos_remove_request,
TP_ARGS(name, type, new_value) TP_ARGS(name, type, new_value)
); );
DECLARE_TRACE(sugov_util_update_tp,
TP_PROTO(unsigned int cpu, unsigned long util, unsigned long max_cap, unsigned int flags),
TP_ARGS(cpu, util, max_cap, flags));
DECLARE_TRACE(sugov_next_freq_tp,
TP_PROTO(unsigned int cpu, unsigned long util, unsigned long max, unsigned int freq),
TP_ARGS(cpu, util, max, freq));
#endif /* _TRACE_POWER_H */ #endif /* _TRACE_POWER_H */
/* This part must be outside protection */ /* This part must be outside protection */

8
include/trace/events/sched.h
View File

@@ -677,14 +677,6 @@ DECLARE_TRACE(sched_update_nr_running_tp,
TP_PROTO(struct rq *rq, int change), TP_PROTO(struct rq *rq, int change),
TP_ARGS(rq, change)); TP_ARGS(rq, change));
DECLARE_TRACE(sugov_util_update_tp,
TP_PROTO(unsigned int cpu, unsigned long util, unsigned long max_cap, unsigned int flags),
TP_ARGS(cpu, util, max_cap, flags));
DECLARE_TRACE(sugov_next_freq_tp,
TP_PROTO(unsigned int cpu, unsigned long util, unsigned long max, unsigned int freq),
TP_ARGS(cpu, util, max, freq));
#endif /* _TRACE_SCHED_H */ #endif /* _TRACE_SCHED_H */
/* This part must be outside protection */ /* This part must be outside protection */

2
kernel/sched/core.c
View File

@@ -45,8 +45,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(sched_util_est_cfs_tp);
EXPORT_TRACEPOINT_SYMBOL_GPL(sched_util_est_se_tp); EXPORT_TRACEPOINT_SYMBOL_GPL(sched_util_est_se_tp);
EXPORT_TRACEPOINT_SYMBOL_GPL(sched_update_nr_running_tp); EXPORT_TRACEPOINT_SYMBOL_GPL(sched_update_nr_running_tp);
EXPORT_TRACEPOINT_SYMBOL_GPL(sched_switch); EXPORT_TRACEPOINT_SYMBOL_GPL(sched_switch);
EXPORT_TRACEPOINT_SYMBOL_GPL(sugov_next_freq_tp);
EXPORT_TRACEPOINT_SYMBOL_GPL(sugov_util_update_tp);
DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues); DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues);
EXPORT_SYMBOL_GPL(runqueues); EXPORT_SYMBOL_GPL(runqueues);

4
kernel/sched/cpufreq_schedutil.c
View File

@@ -538,11 +538,11 @@ sugov_update_shared(struct update_util_data *hook, u64 time, unsigned int flags)
ignore_dl_rate_limit(sg_cpu, sg_policy); ignore_dl_rate_limit(sg_cpu, sg_policy);
trace_sugov_util_update_tp(sg_cpu->cpu, util, sg_cpu->max, flags);
if (sugov_should_update_freq(sg_policy, time)) { if (sugov_should_update_freq(sg_policy, time)) {
next_f = sugov_next_freq_shared(sg_cpu, time); next_f = sugov_next_freq_shared(sg_cpu, time);
trace_sugov_util_update_tp(sg_cpu->cpu, util, sg_cpu->max, flags);
if (sg_policy->policy->fast_switch_enabled) if (sg_policy->policy->fast_switch_enabled)
sugov_fast_switch(sg_policy, time, next_f); sugov_fast_switch(sg_policy, time, next_f);
else else

2
kernel/trace/power-traces.c
View File

@@ -21,3 +21,5 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(powernv_throttle);
EXPORT_TRACEPOINT_SYMBOL_GPL(device_pm_callback_start); EXPORT_TRACEPOINT_SYMBOL_GPL(device_pm_callback_start);
EXPORT_TRACEPOINT_SYMBOL_GPL(device_pm_callback_end); EXPORT_TRACEPOINT_SYMBOL_GPL(device_pm_callback_end);
EXPORT_TRACEPOINT_SYMBOL_GPL(clock_set_rate); EXPORT_TRACEPOINT_SYMBOL_GPL(clock_set_rate);
EXPORT_TRACEPOINT_SYMBOL_GPL(sugov_next_freq_tp);
EXPORT_TRACEPOINT_SYMBOL_GPL(sugov_util_update_tp);