Skip to contentSkip to conversation

usb: typec: tcpm: Fix wrong handling in GET_SINK_CAP

PATCH In review Kyle Tso 3 participants 3 messages May 3, 2021 – May 5, 2021

Subsystems (3)
USB USB Type-C class USB Type-C port controller drivers
lore
Share & tools
lore

Kyle Tso

author
#0 lore raw

PATCH 1/1 usb: typec: tcpm: Fix wrong handling in GET_SINK_CAP

After receiving Sink Capabilities Message in GET_SINK_CAP AMS, it is incorrect to call tcpm_pd_handle_state because the Message is expected and the current state is not Ready states. The result of this incorrect operation ends in Soft Reset which is definitely wrong. Simply forwarding to Ready States is enough to finish the AMS.

Fixes 8dea75e11380 ("usb: typec: tcpm: Protocol Error handling")
Signed-off-by Kyle Tso <[email protected]>
---
 drivers/usb/typec/tcpm/tcpm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/typec/tcpm/tcpm.c +1 -1
index c4fdc00a3bc8..68e04e397e92 100644
@@ -2390,7 +2390,7 @@ static void tcpm_pd_data_request(struct tcpm_port *port,
 		port->nr_sink_caps = cnt;
 		port->sink_cap_done = true;
 		if (port->ams == GET_SINK_CAPABILITIES)
-			tcpm_pd_handle_state(port, ready_state(port), NONE_AMS, 0);
+			tcpm_set_state(port, ready_state(port), 0);
 		/* Unexpected Sink Capabilities */
 		else
 			tcpm_pd_handle_msg(port,
Signature · 1 line
2.31.1.527.g47e6f16901-goog
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Kyle Tso

After receiving Sink Capabilities Message in GET_SINK_CAP AMS, it is incorrect to call tcpm_pd_handle_state because the Message is expected and the current state is not Ready states. The result of this incorrect operation ends in Soft Reset which is definitely wrong. Simply forwarding to Ready States is enough to finish the AMS.

Fixes 8dea75e11380 ("usb: typec: tcpm: Protocol Error handling")
Signed-off-by Kyle Tso <[email protected]>
Reviewed-by Guenter Roeck <[email protected]>
Quoted 18 lines
---
 drivers/usb/typec/tcpm/tcpm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/typec/tcpm/tcpm.c +1 -1
index c4fdc00a3bc8..68e04e397e92 100644
@@ -2390,7 +2390,7 @@ static void tcpm_pd_data_request(struct tcpm_port *port,
 		port->nr_sink_caps = cnt;
 		port->sink_cap_done = true;
 		if (port->ams == GET_SINK_CAPABILITIES)
-			tcpm_pd_handle_state(port, ready_state(port), NONE_AMS, 0);
+			tcpm_set_state(port, ready_state(port), 0);
 		/* Unexpected Sink Capabilities */
 		else
 			tcpm_pd_handle_msg(port,
maintainer Acked-by on v1 1/1
#2 lore raw
In reply to Kyle Tso
Quoted 8 lines · Kyle Tso

After receiving Sink Capabilities Message in GET_SINK_CAP AMS, it is incorrect to call tcpm_pd_handle_state because the Message is expected and the current state is not Ready states. The result of this incorrect operation ends in Soft Reset which is definitely wrong. Simply forwarding to Ready States is enough to finish the AMS.

Fixes 8dea75e11380 ("usb: typec: tcpm: Protocol Error handling")
Signed-off-by Kyle Tso <[email protected]>
Acked-by Heikki Krogerus <[email protected]>
Quoted 19 lines
---
 drivers/usb/typec/tcpm/tcpm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/typec/tcpm/tcpm.c +1 -1
index c4fdc00a3bc8..68e04e397e92 100644
@@ -2390,7 +2390,7 @@ static void tcpm_pd_data_request(struct tcpm_port *port,
 		port->nr_sink_caps = cnt;
 		port->sink_cap_done = true;
 		if (port->ams == GET_SINK_CAPABILITIES)
-			tcpm_pd_handle_state(port, ready_state(port), NONE_AMS, 0);
+			tcpm_set_state(port, ready_state(port), 0);
 		/* Unexpected Sink Capabilities */
 		else
 			tcpm_pd_handle_msg(port,
Signature · 1 line
2.31.1.527.g47e6f16901-goog
Signature · 1 line
heikki