Merge "clk: msm: clock-debug: Print VDD level in clock_state traces" (59f5ac90) · Commits · e / devices / android_kernel_sony_msm8998

drivers/clk/msm/clock-debug.c

+6 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007 Google, Inc.
		* Copyright (c) 2007-2014, The Linux Foundation. All rights reserved.
		* Copyright (c) 2007-2014, 2016, The Linux Foundation. All rights reserved.
		*
		* This software is licensed under the terms of the GNU General Public
		* License version 2, as published by the Free Software Foundation, and
		@@ -355,8 +355,12 @@ static int trace_clocks_show(struct seq_file m, void unused)
		return 1;
		}
		list_for_each_entry(c, &clk_list, list) {
		int vlevel = 0;

		if (c->num_fmax)
		vlevel = find_vdd_level(c, c->rate);
		trace_clock_state(c->dbg_name, c->prepare_count, c->count,
		c->rate);
		c->rate, vlevel);
		total_cnt++;
		}
		mutex_unlock(&clk_list_lock);

+8 −4

Original line number	Diff line number	Diff line
		@@ -369,15 +369,17 @@ TRACE_EVENT(clock_set_parent,
		TRACE_EVENT(clock_state,

		TP_PROTO(const char *name, unsigned long prepare_count,
		unsigned long count, unsigned long rate),
		unsigned long count, unsigned long rate,
		unsigned int vdd_level),

		TP_ARGS(name, prepare_count, count, rate),
		TP_ARGS(name, prepare_count, count, rate, vdd_level),

		TP_STRUCT__entry(
		__string(name, name)
		__field(unsigned long, prepare_count)
		__field(unsigned long, count)
		__field(unsigned long, rate)
		__field(unsigned int, vdd_level)
		),

		TP_fast_assign(
		@@ -385,10 +387,12 @@ TRACE_EVENT(clock_state,
		__entry->prepare_count = prepare_count;
		__entry->count = count;
		__entry->rate = rate;
		__entry->vdd_level = vdd_level;
		),

		TP_printk("%s\t[%lu:%lu]\t%lu", __get_str(name), __entry->prepare_count,
		__entry->count, __entry->rate)
		TP_printk("%s\tprepare:enable cnt [%lu:%lu]\trate: vdd level [%lu:%u]",
		__get_str(name), __entry->prepare_count,
		__entry->count, __entry->rate, __entry->vdd_level)
		);

		/*