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

Commit 6ebad12a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cpufreq: schedutil: Add current capacity info to schedutil tracepoint"

parents 5adbff53 2cd0e9ea

include/trace/events/power.h

+9 −6
Original line number Diff line number Diff line
@@ -769,13 +769,14 @@ TRACE_EVENT(memlat_dev_update, 


TRACE_EVENT(sugov_util_update,

	    TP_PROTO(int cpu,

		     unsigned long util, unsigned long max_cap,

		     unsigned long nl, unsigned long pl,

		     unsigned long util, unsigned long avg_cap,

		     unsigned long max_cap, unsigned long nl, unsigned long pl,

		     unsigned int flags),

	    TP_ARGS(cpu, util, max_cap, nl, pl, flags),

	    TP_ARGS(cpu, util, avg_cap, max_cap, nl, pl, flags),

	    TP_STRUCT__entry(

		    __field(	int,		cpu)

		    __field(	unsigned long,	util)

		    __field(	unsigned long,	avg_cap)

		    __field(	unsigned long,	max_cap)

		    __field(	unsigned long,	nl)

		    __field(	unsigned long,	pl)
@@ -784,14 +785,16 @@ TRACE_EVENT(sugov_util_update, 
	    TP_fast_assign(

		    __entry->cpu = cpu;

		    __entry->util = util;

		    __entry->avg_cap = avg_cap;

		    __entry->max_cap = max_cap;

		    __entry->nl = nl;

		    __entry->pl = pl;

		    __entry->flags = flags;

	    ),

	    TP_printk("cpu=%d util=%lu max_cap=%lu nl=%lu pl=%lu flags=%x",

		      __entry->cpu, __entry->util, __entry->max_cap,

		      __entry->nl, __entry->pl, __entry->flags)

	    TP_printk("cpu=%d util=%lu avg_cap=%lu max_cap=%lu nl=%lu pl=%lu flags=0x%x",

		      __entry->cpu, __entry->util, __entry->avg_cap,

		      __entry->max_cap, __entry->nl,

		      __entry->pl, __entry->flags)

);



DECLARE_EVENT_CLASS(kpm_module,

kernel/sched/cpufreq_schedutil.c

+2 −2
Original line number Diff line number Diff line
@@ -399,8 +399,8 @@ static void sugov_update_shared(struct update_util_data *hook, u64 time, 
	sugov_calc_avg_cap(sg_policy, sg_cpu->walt_load.ws,

			   sg_policy->policy->cur);



	trace_sugov_util_update(sg_cpu->cpu, sg_cpu->util, max,

				sg_cpu->walt_load.nl,

	trace_sugov_util_update(sg_cpu->cpu, sg_cpu->util, sg_policy->avg_cap,

				max, sg_cpu->walt_load.nl,

				sg_cpu->walt_load.pl, flags);



	if (sugov_should_update_freq(sg_policy, time)) {