korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 16:24:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

usb: typec: tcpm: clear pd_event queue in PORT_RESET

Browse Source 
commit bf20c69cf3 upstream.

When a Fast Role Swap control message attempt results in a transition
to ERROR_RECOVERY, the TCPC can still queue a TCPM_SOURCING_VBUS event.

If the event is queued but processed after the tcpm_reset_port() call
in the PORT_RESET state, then the following occurs:
1. tcpm_reset_port() calls tcpm_init_vbus() to reset the vbus sourcing and
sinking state
2. tcpm_pd_event_handler() turns VBUS on before the port is in the default
state.
3. The port resolves as a sink. In the SNK_DISCOVERY state,
tcpm_set_charge() cannot set vbus to charge.

Clear pd events within PORT_RESET to get rid of non-applicable events.

Fixes: b17dd57118 ("staging: typec: tcpm: Improve role swap with non PD capable partners")
Cc: stable@vger.kernel.org
Signed-off-by: RD Babiera <rdbabiera@google.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20240423202715.3375827-2-rdbabiera@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
RD Babiera 2024-04-23 20:27:16 +00:00 committed by Greg Kroah-Hartman
parent 38e9ac2b34
commit 59f1713280
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/usb/typec/tcpm/tcpm.c
View File

@ -4873,6 +4873,7 @@ static void run_state_machine(struct tcpm_port *port)
break; break;
case PORT_RESET: case PORT_RESET:
tcpm_reset_port(port); tcpm_reset_port(port);
port->pd_events = 0;
if (port->self_powered) if (port->self_powered)
tcpm_set_cc(port, TYPEC_CC_OPEN); tcpm_set_cc(port, TYPEC_CC_OPEN);
else else