On Sat, Feb 17, 2024 at 05:20:21PM +0100, Ondřej Jirman wrote: > From: Ondrej Jirman <megi@xxxxxx> > > The reverted commit makes the state machine only ever go from SRC_ATTACH_WAIT > to SNK_TRY in endless loop when toggling. After revert it goes to SRC_ATTACHED > after initially trying SNK_TRY earlier, as it should for toggling to ever detect > the power source mode and the port is again able to provide power to attached > power sinks. > > This reverts commit 2d6d80127006ae3da26b1f21a65eccf957f2d1e5. > > Cc: stable@xxxxxxxxxxxxxxx > Fixes: 2d6d80127006 ("usb: typec: tcpm: reset counter when enter into unattached state after try role") > Signed-of-by: Ondrej Jirman <megi@xxxxxx> Acked-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx> > --- > drivers/usb/typec/tcpm/tcpm.c | 3 --- > 1 file changed, 3 deletions(-) > > See https://lore.kernel.org/all/odggrbbgjpardze76qiv57mw6tllisyu5sbrta37iadjzwamcv@qr3ubwnlzqqt/ > for more. > > diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c > index f7d7daa60c8d..295ae7eb912c 100644 > --- a/drivers/usb/typec/tcpm/tcpm.c > +++ b/drivers/usb/typec/tcpm/tcpm.c > @@ -3743,9 +3743,6 @@ static void tcpm_detach(struct tcpm_port *port) > if (tcpm_port_is_disconnected(port)) > port->hard_reset_count = 0; > > - port->try_src_count = 0; > - port->try_snk_count = 0; > - > if (!port->attached) > return; > > -- > 2.43.0 -- heikki