From 297a344d5238c049fdc234c34dd7bb0d83f01271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Tue, 19 Dec 2017 10:00:12 +0100 Subject: [PATCH] siox: add support for tracing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Implement tracing for SIOX. There are events for the data that is written to the bus and for data being read from it. Acked-by: Gavin Schenk Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman --- drivers/siox/siox-core.c | 12 +++++++ include/trace/events/siox.h | 66 +++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 include/trace/events/siox.h diff --git a/drivers/siox/siox-core.c b/drivers/siox/siox-core.c index 16585c1b2b9e..fdfcdea25867 100644 --- a/drivers/siox/siox-core.c +++ b/drivers/siox/siox-core.c @@ -33,6 +33,9 @@ */ #define SIOX_STATUS_TYPE 0xf0 +#define CREATE_TRACE_POINTS +#include + static bool siox_is_registered; static void siox_master_lock(struct siox_master *smaster) @@ -126,6 +129,7 @@ static void siox_poll(struct siox_master *smaster) { struct siox_device *sdevice; size_t i = smaster->setbuf_len; + unsigned int devno = 0; int unsync_error = 0; smaster->last_poll = jiffies; @@ -172,6 +176,10 @@ static void siox_poll(struct siox_master *smaster) sdevice->status_written &= ~SIOX_STATUS_WDG; smaster->buf[i] = sdevice->status_written; + + trace_siox_set_data(smaster, sdevice, devno, i); + + devno++; } smaster->pushpull(smaster, smaster->setbuf_len, smaster->buf, @@ -181,6 +189,7 @@ static void siox_poll(struct siox_master *smaster) unsync_error = 0; /* interpret data pulled in from devices in buf[setbuf_len..] */ + devno = 0; i = smaster->setbuf_len; list_for_each_entry(sdevice, &smaster->devices, node) { struct siox_driver *sdriver = @@ -255,10 +264,13 @@ static void siox_poll(struct siox_master *smaster) sdevice->status_written_lastcycle = sdevice->status_written; sdevice->connected = connected; + trace_siox_get_data(smaster, sdevice, devno, status_clean, i); + /* only give data read to driver if the device is connected */ if (sdriver && connected) sdriver->get_data(sdevice, &smaster->buf[i]); + devno++; i += sdevice->outbytes; } } diff --git a/include/trace/events/siox.h b/include/trace/events/siox.h new file mode 100644 index 000000000000..68a43fc2c3a5 --- /dev/null +++ b/include/trace/events/siox.h @@ -0,0 +1,66 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM siox + +#if !defined(_TRACE_SIOX_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_SIOX_H + +#include + +TRACE_EVENT(siox_set_data, + TP_PROTO(const struct siox_master *smaster, + const struct siox_device *sdevice, + unsigned int devno, size_t bufoffset), + TP_ARGS(smaster, sdevice, devno, bufoffset), + TP_STRUCT__entry( + __field(int, busno) + __field(unsigned int, devno) + __field(size_t, inbytes) + __dynamic_array(u8, buf, sdevice->inbytes) + ), + TP_fast_assign( + __entry->busno = smaster->busno; + __entry->devno = devno; + __entry->inbytes = sdevice->inbytes; + memcpy(__get_dynamic_array(buf), + smaster->buf + bufoffset, sdevice->inbytes); + ), + TP_printk("siox-%d-%u [%*phD]", + __entry->busno, + __entry->devno, + (int)__entry->inbytes, __get_dynamic_array(buf) + ) +); + +TRACE_EVENT(siox_get_data, + TP_PROTO(const struct siox_master *smaster, + const struct siox_device *sdevice, + unsigned int devno, u8 status_clean, + size_t bufoffset), + TP_ARGS(smaster, sdevice, devno, status_clean, bufoffset), + TP_STRUCT__entry( + __field(int, busno) + __field(unsigned int, devno) + __field(u8, status_clean) + __field(size_t, outbytes) + __dynamic_array(u8, buf, sdevice->outbytes) + ), + TP_fast_assign( + __entry->busno = smaster->busno; + __entry->devno = devno; + __entry->status_clean = status_clean; + __entry->outbytes = sdevice->outbytes; + memcpy(__get_dynamic_array(buf), + smaster->buf + bufoffset, sdevice->outbytes); + ), + TP_printk("siox-%d-%u (%02hhx) [%*phD]", + __entry->busno, + __entry->devno, + __entry->status_clean, + (int)__entry->outbytes, __get_dynamic_array(buf) + ) +); + +#endif /* if !defined(_TRACE_SIOX_H) || defined(TRACE_HEADER_MULTI_READ) */ + +/* This part must be outside protection */ +#include