Message ID | 20231003155842.57313-8-alkuor@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 0aaa6d16183d5a3f24e2c64354473b90bc61b22f |
Headers | show |
Series | Add TPS25750 USB type-C PD controller support | expand |
On Tue, Oct 03, 2023 at 11:58:40AM -0400, Abdel Alkuor wrote: > From: Abdel Alkuor <abdelalkuor@geotab.com> > > 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> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > Changes in v10: > - Move 0012-USB-typec-tps6598x-Add-trace-for-tps25750-irq.patch to patch 7 > Changes in v9: > - No changes > Changes in v8: > - Use device_is_compatible instead of of_device_is_compatible > Changes in v7: > - Add driver name to commit subject > Changes in v6: > - Check tps25750 using is_compatiable device node > Changes in v5: > - Incorporating tps25750 into tps6598x driver > drivers/usb/typec/tipd/core.c | 1 + > drivers/usb/typec/tipd/trace.h | 22 ++++++++++++++++++++++ > 2 files changed, 23 insertions(+) > > diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c > index 892432ad80a3..e0ff6fc9f256 100644 > --- a/drivers/usb/typec/tipd/core.c > +++ b/drivers/usb/typec/tipd/core.c > @@ -589,6 +589,7 @@ static irqreturn_t tps25750_interrupt(int irq, void *data) > dev_err(tps->dev, "%s: failed to read events\n", __func__); > goto err_unlock; > } > + trace_tps25750_irq(event[0]); > > if (!(event[0] | event[1])) > goto err_unlock; > 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
diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c index 892432ad80a3..e0ff6fc9f256 100644 --- a/drivers/usb/typec/tipd/core.c +++ b/drivers/usb/typec/tipd/core.c @@ -589,6 +589,7 @@ static irqreturn_t tps25750_interrupt(int irq, void *data) dev_err(tps->dev, "%s: failed to read events\n", __func__); goto err_unlock; } + trace_tps25750_irq(event[0]); if (!(event[0] | event[1])) goto err_unlock; 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),