Skip to content

Commit e5d4a41

Browse files
abdelalkuorgregkh
authored andcommitted
USB: typec: tps6598x: Add power status trace for tps25750
tps25750 power status register is a subset of tps6598x power status register. Signed-off-by: Abdel Alkuor <[email protected]> Reviewed-by: Heikki Krogerus <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 0aaa6d1 commit e5d4a41

File tree

3 files changed

+53
-0
lines changed

3 files changed

+53
-0
lines changed

drivers/usb/typec/tipd/core.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1411,6 +1411,7 @@ static const struct tipd_data tps6598x_data = {
14111411
static const struct tipd_data tps25750_data = {
14121412
.irq_handler = tps25750_interrupt,
14131413
.register_port = tps25750_register_port,
1414+
.trace_power_status = trace_tps25750_power_status,
14141415
.apply_patch = tps25750_apply_patch,
14151416
};
14161417

drivers/usb/typec/tipd/tps6598x.h

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,25 @@
161161
#define TPS_POWER_STATUS_BC12_STATUS_CDP 2
162162
#define TPS_POWER_STATUS_BC12_STATUS_DCP 3
163163

164+
/* TPS25750_REG_POWER_STATUS bits */
165+
#define TPS25750_POWER_STATUS_CHARGER_DETECT_STATUS_MASK GENMASK(7, 4)
166+
#define TPS25750_POWER_STATUS_CHARGER_DETECT_STATUS(p) \
167+
TPS_FIELD_GET(TPS25750_POWER_STATUS_CHARGER_DETECT_STATUS_MASK, (p))
168+
#define TPS25750_POWER_STATUS_CHARGER_ADVERTISE_STATUS_MASK GENMASK(9, 8)
169+
#define TPS25750_POWER_STATUS_CHARGER_ADVERTISE_STATUS(p) \
170+
TPS_FIELD_GET(TPS25750_POWER_STATUS_CHARGER_ADVERTISE_STATUS_MASK, (p))
171+
172+
#define TPS25750_POWER_STATUS_CHARGER_DET_STATUS_DISABLED 0
173+
#define TPS25750_POWER_STATUS_CHARGER_DET_STATUS_IN_PROGRESS 1
174+
#define TPS25750_POWER_STATUS_CHARGER_DET_STATUS_NONE 2
175+
#define TPS25750_POWER_STATUS_CHARGER_DET_STATUS_SPD 3
176+
#define TPS25750_POWER_STATUS_CHARGER_DET_STATUS_BC_1_2_CPD 4
177+
#define TPS25750_POWER_STATUS_CHARGER_DET_STATUS_BC_1_2_DPD 5
178+
#define TPS25750_POWER_STATUS_CHARGER_DET_STATUS_DIV_1_DCP 6
179+
#define TPS25750_POWER_STATUS_CHARGER_DET_STATUS_DIV_2_DCP 7
180+
#define TPS25750_POWER_STATUS_CHARGER_DET_STATUS_DIV_3_DCP 8
181+
#define TPS25750_POWER_STATUS_CHARGER_DET_STATUS_1_2V_DCP 9
182+
164183
/* TPS_REG_DATA_STATUS bits */
165184
#define TPS_DATA_STATUS_DATA_CONNECTION BIT(0)
166185
#define TPS_DATA_STATUS_UPSIDE_DOWN BIT(1)

drivers/usb/typec/tipd/trace.h

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,19 @@
166166
{ TPS_POWER_STATUS_BC12_STATUS_CDP, "cdp" }, \
167167
{ TPS_POWER_STATUS_BC12_STATUS_SDP, "sdp" })
168168

169+
#define show_tps25750_power_status_charger_detect_status(power_status) \
170+
__print_symbolic(TPS25750_POWER_STATUS_CHARGER_DETECT_STATUS(power_status), \
171+
{ TPS25750_POWER_STATUS_CHARGER_DET_STATUS_DISABLED, "disabled"}, \
172+
{ TPS25750_POWER_STATUS_CHARGER_DET_STATUS_IN_PROGRESS, "in progress"}, \
173+
{ TPS25750_POWER_STATUS_CHARGER_DET_STATUS_NONE, "none"}, \
174+
{ TPS25750_POWER_STATUS_CHARGER_DET_STATUS_SPD, "spd"}, \
175+
{ TPS25750_POWER_STATUS_CHARGER_DET_STATUS_BC_1_2_CPD, "cpd"}, \
176+
{ TPS25750_POWER_STATUS_CHARGER_DET_STATUS_BC_1_2_DPD, "dpd"}, \
177+
{ TPS25750_POWER_STATUS_CHARGER_DET_STATUS_DIV_1_DCP, "divider 1 dcp"}, \
178+
{ TPS25750_POWER_STATUS_CHARGER_DET_STATUS_DIV_2_DCP, "divider 2 dcp"}, \
179+
{ TPS25750_POWER_STATUS_CHARGER_DET_STATUS_DIV_3_DCP, "divider 3 dpc"}, \
180+
{ TPS25750_POWER_STATUS_CHARGER_DET_STATUS_1_2V_DCP, "1.2V dpc"})
181+
169182
#define TPS_DATA_STATUS_FLAGS_MASK (GENMASK(31, 0) ^ (TPS_DATA_STATUS_DP_PIN_ASSIGNMENT_MASK | \
170183
TPS_DATA_STATUS_TBT_CABLE_SPEED_MASK | \
171184
TPS_DATA_STATUS_TBT_CABLE_GEN_MASK))
@@ -299,6 +312,26 @@ TRACE_EVENT(tps6598x_power_status,
299312
)
300313
);
301314

315+
TRACE_EVENT(tps25750_power_status,
316+
TP_PROTO(u16 power_status),
317+
TP_ARGS(power_status),
318+
319+
TP_STRUCT__entry(
320+
__field(u16, power_status)
321+
),
322+
323+
TP_fast_assign(
324+
__entry->power_status = power_status;
325+
),
326+
327+
TP_printk("conn: %d, pwr-role: %s, typec: %s, charger detect: %s",
328+
!!TPS_POWER_STATUS_CONNECTION(__entry->power_status),
329+
show_power_status_source_sink(__entry->power_status),
330+
show_power_status_typec_status(__entry->power_status),
331+
show_tps25750_power_status_charger_detect_status(__entry->power_status)
332+
)
333+
);
334+
302335
TRACE_EVENT(tps6598x_data_status,
303336
TP_PROTO(u32 data_status),
304337
TP_ARGS(data_status),

0 commit comments

Comments
 (0)