| Message ID | 20210503171849.2605302-1-kyletso@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2e2b8d15adc2f6ab2d4aa0550e241b9742a436a0 |
| Headers | show |
| Series | usb: typec: tcpm: Fix wrong handling in GET_SINK_CAP | expand |
On 5/3/21 10:18 AM, Kyle Tso wrote: > 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 <kyletso@google.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/usb/typec/tcpm/tcpm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c > index c4fdc00a3bc8..68e04e397e92 100644 > --- a/drivers/usb/typec/tcpm/tcpm.c > +++ b/drivers/usb/typec/tcpm/tcpm.c > @@ -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, >
On Tue, May 04, 2021 at 01:18:49AM +0800, Kyle Tso wrote: > 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 <kyletso@google.com> Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > drivers/usb/typec/tcpm/tcpm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c > index c4fdc00a3bc8..68e04e397e92 100644 > --- a/drivers/usb/typec/tcpm/tcpm.c > +++ b/drivers/usb/typec/tcpm/tcpm.c > @@ -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, > -- > 2.31.1.527.g47e6f16901-goog
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index c4fdc00a3bc8..68e04e397e92 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -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,
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 <kyletso@google.com> --- drivers/usb/typec/tcpm/tcpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)