usb: typec: tcpm: apply vbus before data bringup in tcpm_src_attach

This patch fixes Type-C compliance test TD 4.7.6 - Try.SNK DRP Connect
SNKAS.

tVbusON has a limit of 275ms when entering SRC_ATTACHED. Compliance
testers can interpret the TryWait.Src to Attached.Src transition after
Try.Snk as being in Attached.Src the entire time, so ~170ms is lost
to the debounce timer.

Setting the data role can be a costly operation in host mode, and when
completed after 100ms can cause Type-C compliance test check TD 4.7.5.V.4
to fail.

Turn VBUS on before tcpm_set_roles to meet timing requirement.

Fixes: f0690a25a140 ("staging: typec: USB Type-C Port Manager (tcpm)")
Cc: stable <stable@kernel.org>
Signed-off-by: RD Babiera <rdbabiera@google.com>
Reviewed-by: Badhri Jagan Sridharan <badhri@google.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20250618230606.3272497-2-rdbabiera@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index 1a1f9e1f8e4e26a647b4ceb45f07219ef760ba20..1f6fdfaa34bf123f78befe98581c13f66d6731df 100644 (file)
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -4410,17 +4410,6 @@ static int tcpm_src_attach(struct tcpm_port *port)
 
        tcpm_enable_auto_vbus_discharge(port, true);
 
-       ret = tcpm_set_roles(port, true, TYPEC_STATE_USB,
-                            TYPEC_SOURCE, tcpm_data_role_for_source(port));
-       if (ret < 0)
-               return ret;
-
-       if (port->pd_supported) {
-               ret = port->tcpc->set_pd_rx(port->tcpc, true);
-               if (ret < 0)
-                       goto out_disable_mux;
-       }
-
        /*
         * USB Type-C specification, version 1.2,
         * chapter 4.5.2.2.8.1 (Attached.SRC Requirements)
@@ -4430,13 +4419,24 @@ static int tcpm_src_attach(struct tcpm_port *port)
            (polarity == TYPEC_POLARITY_CC2 && port->cc1 == TYPEC_CC_RA)) {
                ret = tcpm_set_vconn(port, true);
                if (ret < 0)
-                       goto out_disable_pd;
+                       return ret;
        }
 
        ret = tcpm_set_vbus(port, true);
        if (ret < 0)
                goto out_disable_vconn;
 
+       ret = tcpm_set_roles(port, true, TYPEC_STATE_USB, TYPEC_SOURCE,
+                            tcpm_data_role_for_source(port));
+       if (ret < 0)
+               goto out_disable_vbus;
+
+       if (port->pd_supported) {
+               ret = port->tcpc->set_pd_rx(port->tcpc, true);
+               if (ret < 0)
+                       goto out_disable_mux;
+       }
+
        port->pd_capable = false;
 
        port->partner = NULL;
@@ -4447,14 +4447,14 @@ static int tcpm_src_attach(struct tcpm_port *port)
 
        return 0;
 
-out_disable_vconn:
-       tcpm_set_vconn(port, false);
-out_disable_pd:
-       if (port->pd_supported)
-               port->tcpc->set_pd_rx(port->tcpc, false);
 out_disable_mux:
        tcpm_mux_set(port, TYPEC_STATE_SAFE, USB_ROLE_NONE,
                     TYPEC_ORIENTATION_NONE);
+out_disable_vbus:
+       tcpm_set_vbus(port, false);
+out_disable_vconn:
+       tcpm_set_vconn(port, false);
+
        return ret;
 }