Skip to content

Commit 69f8916

Browse files
brooniegregkh
authored andcommitted
usb: typec: tpcm: Fix issues with power being removed during reset
Since the merge of b717dfb ("Revert "usb: typec: tcpm: fix cc role at port reset"") into mainline the LibreTech Renegade Elite/Firefly has died during boot, the main symptom observed in testing is a sudden stop in console output. Gábor Stefanik identified in review that the patch would cause power to be removed from devices without batteries (like this board), observing that while the patch is correct according to the spec this appears to be an oversight in the spec. Given that the change makes previously working systems unusable let's revert it, there was some discussion of identifying systems that have alternative power and implementing the standards conforming behaviour in only that case. Fixes: b717dfb ("Revert "usb: typec: tcpm: fix cc role at port reset"") Cc: stable <stable@kernel.org> Cc: Badhri Jagan Sridharan <badhri@google.com> Signed-off-by: Mark Brown <broonie@kernel.org> Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/20240212-usb-fix-renegade-v1-1-22c43c88d635@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 84b6238 commit 69f8916

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/usb/typec/tcpm/tcpm.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4873,7 +4873,8 @@ static void run_state_machine(struct tcpm_port *port)
48734873
break;
48744874
case PORT_RESET:
48754875
tcpm_reset_port(port);
4876-
tcpm_set_cc(port, TYPEC_CC_OPEN);
4876+
tcpm_set_cc(port, tcpm_default_state(port) == SNK_UNATTACHED ?
4877+
TYPEC_CC_RD : tcpm_rp_cc(port));
48774878
tcpm_set_state(port, PORT_RESET_WAIT_OFF,
48784879
PD_T_ERROR_RECOVERY);
48794880
break;

0 commit comments

Comments
 (0)