Unverified Commit eabd9a38 authored by Gwendal Grignou's avatar Gwendal Grignou Committed by Benson Leung
Browse files

platform: chrome: Split trace include file 



cros_ec_trace.h defined 5 tracing events, 2 for cros_ec_proto and
3 for cros_ec_sensorhub_ring.
These 2 files are in different kernel modules, the traces are defined
twice in the kernel which leads to problem enabling only some traces.

Move sensorhub traces from cros_ec_trace.h to cros_ec_sensorhub_trace.h
and enable them only in cros_ec_sensorhub kernel module.

Check we can now enable any single traces: without this patch,
we can only enable all sensorhub traces or none.

Fixes: d453ceb6 ("platform/chrome: sensorhub: Add trace events for sample")

Signed-off-by: default avatarGwendal Grignou <gwendal@chromium.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20220122001301.640337-1-gwendal@chromium.org


Signed-off-by: default avatarBenson Leung <bleung@chromium.org>
parent b579f139

drivers/platform/chrome/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


# tell define_trace.h where to find the cros ec trace header

CFLAGS_cros_ec_trace.o:=		-I$(src)

CFLAGS_cros_ec_sensorhub_ring.o:=	-I$(src)



obj-$(CONFIG_CHROMEOS_LAPTOP)		+= chromeos_laptop.o

obj-$(CONFIG_CHROMEOS_PSTORE)		+= chromeos_pstore.o
@@ -20,7 +21,7 @@ obj-$(CONFIG_CROS_EC_CHARDEV) += cros_ec_chardev.o 
obj-$(CONFIG_CROS_EC_LIGHTBAR)		+= cros_ec_lightbar.o

obj-$(CONFIG_CROS_EC_VBC)		+= cros_ec_vbc.o

obj-$(CONFIG_CROS_EC_DEBUGFS)		+= cros_ec_debugfs.o

cros-ec-sensorhub-objs			:= cros_ec_sensorhub.o cros_ec_sensorhub_ring.o cros_ec_trace.o

cros-ec-sensorhub-objs			:= cros_ec_sensorhub.o cros_ec_sensorhub_ring.o

obj-$(CONFIG_CROS_EC_SENSORHUB)		+= cros-ec-sensorhub.o

obj-$(CONFIG_CROS_EC_SYSFS)		+= cros_ec_sysfs.o

obj-$(CONFIG_CROS_USBPD_LOGGER)		+= cros_usbpd_logger.o

drivers/platform/chrome/cros_ec_sensorhub_ring.c

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
#include <linux/sort.h>

#include <linux/slab.h>



#include "cros_ec_trace.h"

#define CREATE_TRACE_POINTS

#include "cros_ec_sensorhub_trace.h"



/* Precision of fixed point for the m values from the filter */

#define M_PRECISION BIT(23)

drivers/platform/chrome/cros_ec_sensorhub_trace.h

0 → 100644
+123 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Trace events for the ChromeOS Sensorhub kernel module

 *

 * Copyright 2021 Google LLC.

 */



#undef TRACE_SYSTEM

#define TRACE_SYSTEM cros_ec



#if !defined(_CROS_EC_SENSORHUB_TRACE_H_) || defined(TRACE_HEADER_MULTI_READ)

#define _CROS_EC_SENSORHUB_TRACE_H_



#include <linux/types.h>

#include <linux/platform_data/cros_ec_sensorhub.h>



#include <linux/tracepoint.h>



TRACE_EVENT(cros_ec_sensorhub_timestamp,

	    TP_PROTO(u32 ec_sample_timestamp, u32 ec_fifo_timestamp, s64 fifo_timestamp,

		     s64 current_timestamp, s64 current_time),

	TP_ARGS(ec_sample_timestamp, ec_fifo_timestamp, fifo_timestamp, current_timestamp,

		current_time),

	TP_STRUCT__entry(

		__field(u32, ec_sample_timestamp)

		__field(u32, ec_fifo_timestamp)

		__field(s64, fifo_timestamp)

		__field(s64, current_timestamp)

		__field(s64, current_time)

		__field(s64, delta)

	),

	TP_fast_assign(

		__entry->ec_sample_timestamp = ec_sample_timestamp;

		__entry->ec_fifo_timestamp = ec_fifo_timestamp;

		__entry->fifo_timestamp = fifo_timestamp;

		__entry->current_timestamp = current_timestamp;

		__entry->current_time = current_time;

		__entry->delta = current_timestamp - current_time;

	),

	TP_printk("ec_ts: %9u, ec_fifo_ts: %9u, fifo_ts: %12lld, curr_ts: %12lld, curr_time: %12lld, delta %12lld",

		  __entry->ec_sample_timestamp,

		__entry->ec_fifo_timestamp,

		__entry->fifo_timestamp,

		__entry->current_timestamp,

		__entry->current_time,

		__entry->delta

	)

);



TRACE_EVENT(cros_ec_sensorhub_data,

	    TP_PROTO(u32 ec_sensor_num, u32 ec_fifo_timestamp, s64 fifo_timestamp,

		     s64 current_timestamp, s64 current_time),

	TP_ARGS(ec_sensor_num, ec_fifo_timestamp, fifo_timestamp, current_timestamp, current_time),

	TP_STRUCT__entry(

		__field(u32, ec_sensor_num)

		__field(u32, ec_fifo_timestamp)

		__field(s64, fifo_timestamp)

		__field(s64, current_timestamp)

		__field(s64, current_time)

		__field(s64, delta)

	),

	TP_fast_assign(

		__entry->ec_sensor_num = ec_sensor_num;

		__entry->ec_fifo_timestamp = ec_fifo_timestamp;

		__entry->fifo_timestamp = fifo_timestamp;

		__entry->current_timestamp = current_timestamp;

		__entry->current_time = current_time;

		__entry->delta = current_timestamp - current_time;

	),

	TP_printk("ec_num: %4u, ec_fifo_ts: %9u, fifo_ts: %12lld, curr_ts: %12lld, curr_time: %12lld, delta %12lld",

		  __entry->ec_sensor_num,

		__entry->ec_fifo_timestamp,

		__entry->fifo_timestamp,

		__entry->current_timestamp,

		__entry->current_time,

		__entry->delta

	)

);



TRACE_EVENT(cros_ec_sensorhub_filter,

	    TP_PROTO(struct cros_ec_sensors_ts_filter_state *state, s64 dx, s64 dy),

	TP_ARGS(state, dx, dy),

	TP_STRUCT__entry(

		__field(s64, dx)

		__field(s64, dy)

		__field(s64, median_m)

		__field(s64, median_error)

		__field(s64, history_len)

		__field(s64, x)

		__field(s64, y)

	),

	TP_fast_assign(

		__entry->dx = dx;

		__entry->dy = dy;

		__entry->median_m = state->median_m;

		__entry->median_error = state->median_error;

		__entry->history_len = state->history_len;

		__entry->x = state->x_offset;

		__entry->y = state->y_offset;

	),

	TP_printk("dx: %12lld. dy: %12lld median_m: %12lld median_error: %12lld len: %lld x: %12lld y: %12lld",

		  __entry->dx,

		__entry->dy,

		__entry->median_m,

		__entry->median_error,

		__entry->history_len,

		__entry->x,

		__entry->y

	)

);





#endif /* _CROS_EC_SENSORHUB_TRACE_H_ */



/* this part must be outside header guard */



#undef TRACE_INCLUDE_PATH

#define TRACE_INCLUDE_PATH .



#undef TRACE_INCLUDE_FILE

#define TRACE_INCLUDE_FILE cros_ec_sensorhub_trace



#include <trace/define_trace.h>

drivers/platform/chrome/cros_ec_trace.h

+0 −95
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/types.h>

#include <linux/platform_data/cros_ec_commands.h>

#include <linux/platform_data/cros_ec_proto.h>

#include <linux/platform_data/cros_ec_sensorhub.h>



#include <linux/tracepoint.h>
@@ -71,100 +70,6 @@ TRACE_EVENT(cros_ec_request_done, 
		  __entry->retval)

);



TRACE_EVENT(cros_ec_sensorhub_timestamp,

	    TP_PROTO(u32 ec_sample_timestamp, u32 ec_fifo_timestamp, s64 fifo_timestamp,

		     s64 current_timestamp, s64 current_time),

	TP_ARGS(ec_sample_timestamp, ec_fifo_timestamp, fifo_timestamp, current_timestamp,

		current_time),

	TP_STRUCT__entry(

		__field(u32, ec_sample_timestamp)

		__field(u32, ec_fifo_timestamp)

		__field(s64, fifo_timestamp)

		__field(s64, current_timestamp)

		__field(s64, current_time)

		__field(s64, delta)

	),

	TP_fast_assign(

		__entry->ec_sample_timestamp = ec_sample_timestamp;

		__entry->ec_fifo_timestamp = ec_fifo_timestamp;

		__entry->fifo_timestamp = fifo_timestamp;

		__entry->current_timestamp = current_timestamp;

		__entry->current_time = current_time;

		__entry->delta = current_timestamp - current_time;

	),

	TP_printk("ec_ts: %9u, ec_fifo_ts: %9u, fifo_ts: %12lld, curr_ts: %12lld, curr_time: %12lld, delta %12lld",

		  __entry->ec_sample_timestamp,

		__entry->ec_fifo_timestamp,

		__entry->fifo_timestamp,

		__entry->current_timestamp,

		__entry->current_time,

		__entry->delta

	)

);



TRACE_EVENT(cros_ec_sensorhub_data,

	    TP_PROTO(u32 ec_sensor_num, u32 ec_fifo_timestamp, s64 fifo_timestamp,

		     s64 current_timestamp, s64 current_time),

	TP_ARGS(ec_sensor_num, ec_fifo_timestamp, fifo_timestamp, current_timestamp, current_time),

	TP_STRUCT__entry(

		__field(u32, ec_sensor_num)

		__field(u32, ec_fifo_timestamp)

		__field(s64, fifo_timestamp)

		__field(s64, current_timestamp)

		__field(s64, current_time)

		__field(s64, delta)

	),

	TP_fast_assign(

		__entry->ec_sensor_num = ec_sensor_num;

		__entry->ec_fifo_timestamp = ec_fifo_timestamp;

		__entry->fifo_timestamp = fifo_timestamp;

		__entry->current_timestamp = current_timestamp;

		__entry->current_time = current_time;

		__entry->delta = current_timestamp - current_time;

	),

	TP_printk("ec_num: %4u, ec_fifo_ts: %9u, fifo_ts: %12lld, curr_ts: %12lld, curr_time: %12lld, delta %12lld",

		  __entry->ec_sensor_num,

		__entry->ec_fifo_timestamp,

		__entry->fifo_timestamp,

		__entry->current_timestamp,

		__entry->current_time,

		__entry->delta

	)

);



TRACE_EVENT(cros_ec_sensorhub_filter,

	    TP_PROTO(struct cros_ec_sensors_ts_filter_state *state, s64 dx, s64 dy),

	TP_ARGS(state, dx, dy),

	TP_STRUCT__entry(

		__field(s64, dx)

		__field(s64, dy)

		__field(s64, median_m)

		__field(s64, median_error)

		__field(s64, history_len)

		__field(s64, x)

		__field(s64, y)

	),

	TP_fast_assign(

		__entry->dx = dx;

		__entry->dy = dy;

		__entry->median_m = state->median_m;

		__entry->median_error = state->median_error;

		__entry->history_len = state->history_len;

		__entry->x = state->x_offset;

		__entry->y = state->y_offset;

	),

	TP_printk("dx: %12lld. dy: %12lld median_m: %12lld median_error: %12lld len: %lld x: %12lld y: %12lld",

		  __entry->dx,

		__entry->dy,

		__entry->median_m,

		__entry->median_error,

		__entry->history_len,

		__entry->x,

		__entry->y

	)

);





#endif /* _CROS_EC_TRACE_H_ */



/* this part must be outside header guard */