USB: typec: tcpm: Hard Reset after not receiving a Request

PD 3.0 spec 8.3.3.2.3, A Get_Source_Cap message is sent
to a UUT that is in the PE_SRC_Ready state. After sending
a Source_Capabilities message, the UUT should then expect
a Request message in response. When one is not received,
the UUT should timeout to PE_SRC_Hard_Reset.

Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: Badhri Jagan Sridharan <badhri@google.com>
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: pumahsu <pumahsu@google.com>
Signed-off-by: Kyle Tso <kyletso@google.com>
Signed-off-by: Will McVicker <willmcvicker@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20201210160521.3417426-3-gregkh@linuxfoundation.org
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 cedc6cf82d61757fd8bbe487c8586d3e29f62666..fa0500a03413fcbd7ef23e6a1f429bca73d92119 100644 (file)
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -2228,6 +2228,7 @@ static int tcpm_pd_send_control(struct tcpm_port *port,
 static bool tcpm_send_queued_message(struct tcpm_port *port)
 {
        enum pd_msg_request queued_message;
+       int ret;
 
        do {
                queued_message = port->queued_message;
@@ -2247,7 +2248,16 @@ static bool tcpm_send_queued_message(struct tcpm_port *port)
                        tcpm_pd_send_sink_caps(port);
                        break;
                case PD_MSG_DATA_SOURCE_CAP:
-                       tcpm_pd_send_source_caps(port);
+                       ret = tcpm_pd_send_source_caps(port);
+                       if (ret < 0) {
+                               tcpm_log(port,
+                                        "Unable to send src caps, ret=%d",
+                                        ret);
+                               tcpm_set_state(port, SOFT_RESET_SEND, 0);
+                       } else if (port->pwr_role == TYPEC_SOURCE) {
+                               tcpm_set_state(port, HARD_RESET_SEND,
+                                              PD_T_SENDER_RESPONSE);
+                       }
                        break;
                default:
                        break;