leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: typec: tps6598x: Add trace event for power status register

Browse Source 
Together with the PD status register this is vital for debugging power
negotiations at runtime.

Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Guido Günther <agx@sigxcpu.org>
Link: https://lore.kernel.org/r/3c92da489fa03d6fe67ac18443c48dccb1bf048a.1613389531.git.agx@sigxcpu.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Guido Günther 2021-02-15 12:46:44 +01:00 committed by Greg Kroah-Hartman
parent 02a9ada7eb
commit 9c9c1ddbf6
3 changed files with 69 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/usb/typec/tps6598x.c
View File

@ -50,11 +50,6 @@ enum {
TPS_PORTINFO_SOURCE,
};
/* TPS_REG_POWER_STATUS bits */
#define TPS_POWER_STATUS_CONNECTION BIT(0)
#define TPS_POWER_STATUS_SOURCESINK BIT(1)
#define TPS_POWER_STATUS_PWROPMODE(p) (((p) & GENMASK(3, 2)) >> 2)
/* TPS_REG_RX_IDENTITY_SOP */
struct tps6598x_rx_identity_reg {
u8 status;
@ -414,6 +409,7 @@ static irqreturn_t tps6598x_interrupt(int irq, void *data)
u64 event1;
u64 event2;
u32 status;
u16 pwr_status;
int ret;
mutex_lock(&tps->lock);
@ -433,6 +429,15 @@ static irqreturn_t tps6598x_interrupt(int irq, void *data)
}
trace_tps6598x_status(status);
if ((event1 | event2) & TPS_REG_INT_POWER_STATUS_UPDATE) {
ret = tps6598x_read16(tps, TPS_REG_POWER_STATUS, &pwr_status);
if (ret < 0) {
dev_err(tps->dev, "failed to read power status: %d\n", ret);
goto err_clear_ints;
}
trace_tps6598x_power_status(pwr_status);
}
/* Handle plug insert or removal */
if ((event1 | event2) & TPS_REG_INT_PLUG_EVENT) {
if (status & TPS_STATUS_PLUG_PRESENT) {
@ -497,8 +502,8 @@ static int tps6598x_psy_get_online(struct tps6598x *tps,
if (ret < 0)
return ret;
if ((pwr_status & TPS_POWER_STATUS_CONNECTION) &&
(pwr_status & TPS_POWER_STATUS_SOURCESINK)) {
if (TPS_POWER_STATUS_CONNECTION(pwr_status) &&
TPS_POWER_STATUS_SOURCESINK(pwr_status)) {
val->intval = 1;
} else {
val->intval = 0;

19
drivers/usb/typec/tps6598x.h
View File

@ -129,4 +129,23 @@
#define TPS_REG_INT_HARD_RESET BIT(1)
#define TPS_REG_INT_PD_SOFT_RESET BIT(0)
/* TPS_REG_POWER_STATUS bits */
#define TPS_POWER_STATUS_CONNECTION(x) TPS_FIELD_GET(BIT(0), (x))
#define TPS_POWER_STATUS_SOURCESINK(x) TPS_FIELD_GET(BIT(1), (x))
#define TPS_POWER_STATUS_BC12_DET(x) TPS_FIELD_GET(BIT(2), (x))
#define TPS_POWER_STATUS_TYPEC_CURRENT_MASK GENMASK(3, 2)
#define TPS_POWER_STATUS_PWROPMODE(p) TPS_FIELD_GET(TPS_POWER_STATUS_TYPEC_CURRENT_MASK, (p))
#define TPS_POWER_STATUS_BC12_STATUS_MASK GENMASK(6, 5)
#define TPS_POWER_STATUS_BC12_STATUS(p) TPS_FIELD_GET(TPS_POWER_STATUS_BC12_STATUS_MASK, (p))
#define TPS_POWER_STATUS_TYPEC_CURRENT_USB 0
#define TPS_POWER_STATUS_TYPEC_CURRENT_1A5 1
#define TPS_POWER_STATUS_TYPEC_CURRENT_3A0 2
#define TPS_POWER_STATUS_TYPEC_CURRENT_PD 3
#define TPS_POWER_STATUS_BC12_STATUS_SDP 0
#define TPS_POWER_STATUS_BC12_STATUS_CDP 2
#define TPS_POWER_STATUS_BC12_STATUS_DCP 3
#endif /* __TPS6598X_H__ */

38
drivers/usb/typec/tps6598x_trace.h
View File

@ -134,6 +134,24 @@
{ TPS_STATUS_HIGH_VOLAGE_WARNING, "HIGH_VOLAGE_WARNING" }, \
{ TPS_STATUS_HIGH_LOW_VOLTAGE_WARNING, "HIGH_LOW_VOLTAGE_WARNING" })
#define show_power_status_source_sink(power_status) \
__print_symbolic(TPS_POWER_STATUS_SOURCESINK(power_status), \
{ 1, "sink" }, \
{ 0, "source" })
#define show_power_status_typec_status(power_status) \
__print_symbolic(TPS_POWER_STATUS_PWROPMODE(power_status), \
{ TPS_POWER_STATUS_TYPEC_CURRENT_PD, "pd" }, \
{ TPS_POWER_STATUS_TYPEC_CURRENT_3A0, "3.0A" }, \
{ TPS_POWER_STATUS_TYPEC_CURRENT_1A5, "1.5A" }, \
{ TPS_POWER_STATUS_TYPEC_CURRENT_USB, "usb" })
#define show_power_status_bc12_status(power_status) \
__print_symbolic(TPS_POWER_STATUS_BC12_STATUS(power_status), \
{ TPS_POWER_STATUS_BC12_STATUS_DCP, "dcp" }, \
{ TPS_POWER_STATUS_BC12_STATUS_CDP, "cdp" }, \
{ TPS_POWER_STATUS_BC12_STATUS_SDP, "sdp" })
TRACE_EVENT(tps6598x_irq,
TP_PROTO(u64 event1,
u64 event2),
@ -181,6 +199,26 @@ TRACE_EVENT(tps6598x_status,
)
);
TRACE_EVENT(tps6598x_power_status,
TP_PROTO(u16 power_status),
TP_ARGS(power_status),
TP_STRUCT__entry(
__field(u16, power_status)
),
TP_fast_assign(
__entry->power_status = power_status;
),
TP_printk("conn: %d, pwr-role: %s, typec: %s, bc: %s",
!!TPS_POWER_STATUS_CONNECTION(__entry->power_status),
show_power_status_source_sink(__entry->power_status),
show_power_status_typec_status(__entry->power_status),
show_power_status_bc12_status(__entry->power_status)
)
);
#endif /* _TPS6598X_TRACE_H_ */
/* This part must be outside protection */