Skip to content

Commit 4270d2b

Browse files
Badhri Jagan Sridharangregkh
authored andcommitted
usb: typec: tcpm: Fix response to vsafe0V event
Do not transition to SNK_UNATTACHED state when receiving vsafe0v event while in SNK_HARD_RESET_WAIT_VBUS. Ignore VBUS off events as well as in some platforms VBUS off can be signalled more than once. [143515.364753] Requesting mux state 1, usb-role 2, orientation 2 [143515.365520] pending state change SNK_HARD_RESET_SINK_OFF -> SNK_HARD_RESET_SINK_ON @ 650 ms [rev3 HARD_RESET] [143515.632281] CC1: 0 -> 0, CC2: 3 -> 0 [state SNK_HARD_RESET_SINK_OFF, polarity 1, disconnected] [143515.637214] VBUS on [143515.664985] VBUS off [143515.664992] state change SNK_HARD_RESET_SINK_OFF -> SNK_HARD_RESET_WAIT_VBUS [rev3 HARD_RESET] [143515.665564] VBUS VSAFE0V [143515.665566] state change SNK_HARD_RESET_WAIT_VBUS -> SNK_UNATTACHED [rev3 HARD_RESET] Fixes: 28b43d3 ("usb: typec: tcpm: Introduce vsafe0v for vbus") Cc: <stable@vger.kernel.org> Signed-off-by: Badhri Jagan Sridharan <badhri@google.com> Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Link: https://lore.kernel.org/r/20230712085722.1414743-1-badhri@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 5d0c230 commit 4270d2b

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

drivers/usb/typec/tcpm/tcpm.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5349,6 +5349,10 @@ static void _tcpm_pd_vbus_off(struct tcpm_port *port)
53495349
/* Do nothing, vbus drop expected */
53505350
break;
53515351

5352+
case SNK_HARD_RESET_WAIT_VBUS:
5353+
/* Do nothing, its OK to receive vbus off events */
5354+
break;
5355+
53525356
default:
53535357
if (port->pwr_role == TYPEC_SINK && port->attached)
53545358
tcpm_set_state(port, SNK_UNATTACHED, tcpm_wait_for_discharge(port));
@@ -5395,6 +5399,9 @@ static void _tcpm_pd_vbus_vsafe0v(struct tcpm_port *port)
53955399
case SNK_DEBOUNCED:
53965400
/*Do nothing, still waiting for VSAFE5V for connect */
53975401
break;
5402+
case SNK_HARD_RESET_WAIT_VBUS:
5403+
/* Do nothing, its OK to receive vbus off events */
5404+
break;
53985405
default:
53995406
if (port->pwr_role == TYPEC_SINK && port->auto_vbus_discharge_enabled)
54005407
tcpm_set_state(port, SNK_UNATTACHED, 0);

0 commit comments

Comments
 (0)