Skip to content

Commit 297a344

Browse files
Uwe Kleine-Königgregkh
authored andcommitted
siox: add support for tracing
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 <g.schenk@eckelmann.de> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 658a494 commit 297a344

File tree

2 files changed

+78
-0
lines changed

2 files changed

+78
-0
lines changed

drivers/siox/siox-core.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
*/
3434
#define SIOX_STATUS_TYPE 0xf0
3535

36+
#define CREATE_TRACE_POINTS
37+
#include <trace/events/siox.h>
38+
3639
static bool siox_is_registered;
3740

3841
static void siox_master_lock(struct siox_master *smaster)
@@ -126,6 +129,7 @@ static void siox_poll(struct siox_master *smaster)
126129
{
127130
struct siox_device *sdevice;
128131
size_t i = smaster->setbuf_len;
132+
unsigned int devno = 0;
129133
int unsync_error = 0;
130134

131135
smaster->last_poll = jiffies;
@@ -172,6 +176,10 @@ static void siox_poll(struct siox_master *smaster)
172176
sdevice->status_written &= ~SIOX_STATUS_WDG;
173177

174178
smaster->buf[i] = sdevice->status_written;
179+
180+
trace_siox_set_data(smaster, sdevice, devno, i);
181+
182+
devno++;
175183
}
176184

177185
smaster->pushpull(smaster, smaster->setbuf_len, smaster->buf,
@@ -181,6 +189,7 @@ static void siox_poll(struct siox_master *smaster)
181189
unsync_error = 0;
182190

183191
/* interpret data pulled in from devices in buf[setbuf_len..] */
192+
devno = 0;
184193
i = smaster->setbuf_len;
185194
list_for_each_entry(sdevice, &smaster->devices, node) {
186195
struct siox_driver *sdriver =
@@ -255,10 +264,13 @@ static void siox_poll(struct siox_master *smaster)
255264
sdevice->status_written_lastcycle = sdevice->status_written;
256265
sdevice->connected = connected;
257266

267+
trace_siox_get_data(smaster, sdevice, devno, status_clean, i);
268+
258269
/* only give data read to driver if the device is connected */
259270
if (sdriver && connected)
260271
sdriver->get_data(sdevice, &smaster->buf[i]);
261272

273+
devno++;
262274
i += sdevice->outbytes;
263275
}
264276
}

include/trace/events/siox.h

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
#undef TRACE_SYSTEM
2+
#define TRACE_SYSTEM siox
3+
4+
#if !defined(_TRACE_SIOX_H) || defined(TRACE_HEADER_MULTI_READ)
5+
#define _TRACE_SIOX_H
6+
7+
#include <linux/tracepoint.h>
8+
9+
TRACE_EVENT(siox_set_data,
10+
TP_PROTO(const struct siox_master *smaster,
11+
const struct siox_device *sdevice,
12+
unsigned int devno, size_t bufoffset),
13+
TP_ARGS(smaster, sdevice, devno, bufoffset),
14+
TP_STRUCT__entry(
15+
__field(int, busno)
16+
__field(unsigned int, devno)
17+
__field(size_t, inbytes)
18+
__dynamic_array(u8, buf, sdevice->inbytes)
19+
),
20+
TP_fast_assign(
21+
__entry->busno = smaster->busno;
22+
__entry->devno = devno;
23+
__entry->inbytes = sdevice->inbytes;
24+
memcpy(__get_dynamic_array(buf),
25+
smaster->buf + bufoffset, sdevice->inbytes);
26+
),
27+
TP_printk("siox-%d-%u [%*phD]",
28+
__entry->busno,
29+
__entry->devno,
30+
(int)__entry->inbytes, __get_dynamic_array(buf)
31+
)
32+
);
33+
34+
TRACE_EVENT(siox_get_data,
35+
TP_PROTO(const struct siox_master *smaster,
36+
const struct siox_device *sdevice,
37+
unsigned int devno, u8 status_clean,
38+
size_t bufoffset),
39+
TP_ARGS(smaster, sdevice, devno, status_clean, bufoffset),
40+
TP_STRUCT__entry(
41+
__field(int, busno)
42+
__field(unsigned int, devno)
43+
__field(u8, status_clean)
44+
__field(size_t, outbytes)
45+
__dynamic_array(u8, buf, sdevice->outbytes)
46+
),
47+
TP_fast_assign(
48+
__entry->busno = smaster->busno;
49+
__entry->devno = devno;
50+
__entry->status_clean = status_clean;
51+
__entry->outbytes = sdevice->outbytes;
52+
memcpy(__get_dynamic_array(buf),
53+
smaster->buf + bufoffset, sdevice->outbytes);
54+
),
55+
TP_printk("siox-%d-%u (%02hhx) [%*phD]",
56+
__entry->busno,
57+
__entry->devno,
58+
__entry->status_clean,
59+
(int)__entry->outbytes, __get_dynamic_array(buf)
60+
)
61+
);
62+
63+
#endif /* if !defined(_TRACE_SIOX_H) || defined(TRACE_HEADER_MULTI_READ) */
64+
65+
/* This part must be outside protection */
66+
#include <trace/define_trace.h>

0 commit comments

Comments
 (0)