On 13.02.24 18:21, Greg Kroah-Hartman wrote: > 6.7-stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Badhri Jagan Sridharan <badhri@xxxxxxxxxx> > > commit b717dfbf73e842d15174699fe2c6ee4fdde8aa1f upstream. > > This reverts commit 1e35f074399dece73d5df11847d4a0d7a6f49434. TWIMC, that patch (which is also queued for the next 6.6.y-rc) afaics is causing boot issues on rk3399-roc-pc for Mark [now CCed] with mainline. For details see: https://lore.kernel.org/lkml/ZcVPHtPt2Dppe_9q@xxxxxxxxxxxxxxxxxxxxxxxx/https://lore.kernel.org/all/20240212-usb-fix-renegade-v1-1-22c43c88d635@xxxxxxxxxx/ Ciao, Thorsten > Given that ERROR_RECOVERY calls into PORT_RESET for Hi-Zing > the CC pins, setting CC pins to default state during PORT_RESET > breaks error recovery. > > 4.5.2.2.2.1 ErrorRecovery State Requirements > The port shall not drive VBUS or VCONN, and shall present a > high-impedance to ground (above zOPEN) on its CC1 and CC2 pins. > > Hi-Zing the CC pins is the inteded behavior for PORT_RESET. > CC pins are set to default state after tErrorRecovery in > PORT_RESET_WAIT_OFF. > > 4.5.2.2.2.2 Exiting From ErrorRecovery State > A Sink shall transition to Unattached.SNK after tErrorRecovery. > A Source shall transition to Unattached.SRC after tErrorRecovery. > > Cc: stable@xxxxxxxxxxxxxxx > Cc: Frank Wang <frank.wang@xxxxxxxxxxxxxx> > Fixes: 1e35f074399d ("usb: typec: tcpm: fix cc role at port reset") > Signed-off-by: Badhri Jagan Sridharan <badhri@xxxxxxxxxx> > Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx> > Link: https://lore.kernel.org/r/20240117114742.2587779-1-badhri@xxxxxxxxxx > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > --- > drivers/usb/typec/tcpm/tcpm.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > --- a/drivers/usb/typec/tcpm/tcpm.c > +++ b/drivers/usb/typec/tcpm/tcpm.c > @@ -4862,8 +4862,7 @@ static void run_state_machine(struct tcp > break; > case PORT_RESET: > tcpm_reset_port(port); > - tcpm_set_cc(port, tcpm_default_state(port) == SNK_UNATTACHED ? > - TYPEC_CC_RD : tcpm_rp_cc(port)); > + tcpm_set_cc(port, TYPEC_CC_OPEN); > tcpm_set_state(port, PORT_RESET_WAIT_OFF, > PD_T_ERROR_RECOVERY); > break; > >
