USB: typec: tps6598x: Add status trace for tps25750

tps25750 status register is a subset of tps6598x status register, hence
a trace for tps25750 status register is added.

Signed-off-by: Abdel Alkuor <abdelalkuor@geotab.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20231003155842.57313-10-alkuor@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
index 7bdf1ef5dd1acfcb1e77723223cd0b1dcf8a516b..0e867f531d344bea87596b8522dc70d2375a7ef4 100644 (file)
--- a/drivers/usb/typec/tipd/core.c
+++ b/drivers/usb/typec/tipd/core.c
@@ -1412,6 +1412,7 @@ static const struct tipd_data tps25750_data = {
        .irq_handler = tps25750_interrupt,
        .register_port = tps25750_register_port,
        .trace_power_status = trace_tps25750_power_status,
+       .trace_status = trace_tps25750_status,
        .apply_patch = tps25750_apply_patch,
 };
 

diff --git a/drivers/usb/typec/tipd/trace.h b/drivers/usb/typec/tipd/trace.h
index 739b0a2a867df55c649357ba09b23c1cef5ed4b6..0669cca12ea1d4d753fb51f5d60d69fc1032be49 100644 (file)
--- a/drivers/usb/typec/tipd/trace.h
+++ b/drivers/usb/typec/tipd/trace.h
@@ -91,6 +91,14 @@
                                                      TPS_STATUS_USB_HOST_PRESENT_MASK | \
                                                      TPS_STATUS_LEGACY_MASK))
 
+#define TPS25750_STATUS_FLAGS_MASK (GENMASK(31, 0) ^ (TPS_STATUS_CONN_STATE_MASK | \
+                                                     GENMASK(19, 7) | \
+                                                     TPS_STATUS_VBUS_STATUS_MASK | \
+                                                     TPS_STATUS_USB_HOST_PRESENT_MASK | \
+                                                     TPS_STATUS_LEGACY_MASK | \
+                                                     BIT(26) | \
+                                                     GENMASK(31, 28)))
+
 #define show_status_conn_state(status) \
        __print_symbolic(TPS_STATUS_CONN_STATE((status)), \
                { TPS_STATUS_CONN_STATE_CONN_WITH_R_A,  "conn-Ra"  }, \
@@ -148,6 +156,14 @@
                      { TPS_STATUS_HIGH_VOLAGE_WARNING, "HIGH_VOLAGE_WARNING" }, \
                      { TPS_STATUS_HIGH_LOW_VOLTAGE_WARNING, "HIGH_LOW_VOLTAGE_WARNING" })
 
+#define show_tps25750_status_flags(flags) \
+       __print_flags((flags & TPS25750_STATUS_FLAGS_MASK), "|", \
+                     { TPS_STATUS_PLUG_PRESENT,        "PLUG_PRESENT" }, \
+                     { TPS_STATUS_PLUG_UPSIDE_DOWN,    "UPSIDE_DOWN" }, \
+                     { TPS_STATUS_PORTROLE,            "PORTROLE" }, \
+                     { TPS_STATUS_DATAROLE,            "DATAROLE" }, \
+                     { TPS_STATUS_BIST,                "BIST" })
+
 #define show_power_status_source_sink(power_status) \
        __print_symbolic(TPS_POWER_STATUS_SOURCESINK(power_status), \
                { 1, "sink" }, \
@@ -292,6 +308,27 @@ TRACE_EVENT(tps6598x_status,
                    )
 );
 
+TRACE_EVENT(tps25750_status,
+           TP_PROTO(u32 status),
+           TP_ARGS(status),
+
+           TP_STRUCT__entry(
+                            __field(u32, status)
+                            ),
+
+           TP_fast_assign(
+                          __entry->status = status;
+                          ),
+
+           TP_printk("conn: %s, vbus: %s, usb-host: %s, legacy: %s, flags: %s",
+                     show_status_conn_state(__entry->status),
+                     show_status_vbus_status(__entry->status),
+                     show_status_usb_host_present(__entry->status),
+                     show_status_legacy(__entry->status),
+                     show_tps25750_status_flags(__entry->status)
+                   )
+);
+
 TRACE_EVENT(tps6598x_power_status,
            TP_PROTO(u16 power_status),
            TP_ARGS(power_status),