[PATCH v6 12/14] USB: typec: Add trace for tps25750 irq

Abdel Alkuor
2023-09-23T07:41:46Z

tps25750 event1 register doesn't have all bits in tps6598x
event registers, only show the events that are masked

Signed-off-by: Abdel Alkuor <abdelalkuor@geotab.com>
---
Changes in v6:
- Add trace irq to tipd callbacks factory
Changes in v5:
- Incorporating tps25750 into tps6598x driver

drivers/usb/typec/tipd/core.c | 17 ++++++++++++++++-
drivers/usb/typec/tipd/trace.h | 22 ++++++++++++++++++++++
2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
index 661ded2ff2d5..ba28ce477f21 100644
--- a/drivers/usb/typec/tipd/core.c
+++ b/drivers/usb/typec/tipd/core.c
@@ -110,6 +110,7 @@ struct tipd_data {
int (*read_events)(struct tps6598x *tps, void *events);
int (*clear_events)(struct tps6598x *tps, void *events);
int (*register_port)(struct tps6598x *tps, struct fwnode_handle *node);
+ void (*trace_irq)(void *events);
};

struct tps6598x {
@@ -534,6 +535,13 @@ static int tps6598x_clear_events(struct tps6598x *tps, void *events)
tps6598x_write64(tps, TPS_REG_INT_CLEAR2, e[1]);
}

+static void tps6598x_trace_irq(void *events)
+{
+ uint64_t *e = events;
+
+ trace_tps6598x_irq(e[0], e[1]);
+}
+
static int tps25750_read_events(struct tps6598x *tps, void *events)
{
return tps6598x_block_read(tps, TPS_REG_INT_EVENT1, events, 11);
@@ -544,6 +552,11 @@ static int tps25750_clear_events(struct tps6598x *tps, void *events)
return tps6598x_block_write(tps, TPS_REG_INT_CLEAR1, events, 11);
}

+static void tps25750_trace_irq(void *events)
+{
+ trace_tps25750_irq(*(uint64_t *)events);
+}
+
static irqreturn_t cd321x_interrupt(int irq, void *data)
{
struct tps6598x *tps = data;
@@ -610,7 +623,7 @@ static irqreturn_t tps6598x_interrupt(int irq, void *data)
dev_err(tps->dev, "%s: failed to read events\n", __func__);
goto err_unlock;
}
- trace_tps6598x_irq(event[0], event[1]);
+ tps->cb.trace_irq(event);

if (!(event[0] | event[1]))
goto err_unlock;
@@ -1155,6 +1168,7 @@ static const struct tipd_data tps6598x_data = {
.read_events = tps6598x_read_events,
.clear_events = tps6598x_clear_events,
.register_port = tps6598x_register_port,
+ .trace_irq = tps6598x_trace_irq,
};

static const struct tipd_data tps25750_data = {
@@ -1162,6 +1176,7 @@ static const struct tipd_data tps25750_data = {
.read_events = tps25750_read_events,
.clear_events = tps25750_clear_events,
.register_port = tps25750_register_port,
+ .trace_irq = tps25750_trace_irq,
};

static int tps6598x_probe(struct i2c_client *client)
diff --git a/drivers/usb/typec/tipd/trace.h b/drivers/usb/typec/tipd/trace.h
index 12cad1bde7cc..28725234a2d8 100644
--- a/drivers/usb/typec/tipd/trace.h
+++ b/drivers/usb/typec/tipd/trace.h
@@ -74,6 +74,13 @@
{ APPLE_CD_REG_INT_DATA_STATUS_UPDATE, "DATA_STATUS_UPDATE" }, \
{ APPLE_CD_REG_INT_STATUS_UPDATE, "STATUS_UPDATE" })

+#define show_tps25750_irq_flags(flags) \
+ __print_flags_u64(flags, "|", \
+ { TPS_REG_INT_PLUG_EVENT, "PLUG_EVENT" }, \
+ { TPS_REG_INT_POWER_STATUS_UPDATE, "POWER_STATUS_UPDATE" }, \
+ { TPS_REG_INT_STATUS_UPDATE, "STATUS_UPDATE" }, \
+ { TPS_REG_INT_PD_STATUS_UPDATE, "PD_STATUS_UPDATE" })
+
#define TPS6598X_STATUS_FLAGS_MASK (GENMASK(31, 0) ^ (TPS_STATUS_CONN_STATE_MASK | \
TPS_STATUS_PP_5V0_SWITCH_MASK | \
TPS_STATUS_PP_HV_SWITCH_MASK | \
@@ -230,6 +237,21 @@ TRACE_EVENT(cd321x_irq,
show_cd321x_irq_flags(__entry->event))
);

+TRACE_EVENT(tps25750_irq,
+ TP_PROTO(u64 event),
+ TP_ARGS(event),
+
+ TP_STRUCT__entry(
+ __field(u64, event)
+ ),
+
+ TP_fast_assign(
+ __entry->event = event;
+ ),
+
+ TP_printk("event=%s", show_tps25750_irq_flags(__entry->event))
+);
+
TRACE_EVENT(tps6598x_status,
TP_PROTO(u32 status),
TP_ARGS(status),
--
2.34.1