Commit 659f5d55 authored by Jos Wang's avatar Jos Wang Committed by Greg Kroah-Hartman
Browse files

usb: typec: tcpm: PSSourceOffTimer timeout in PR_Swap enters ERROR_RECOVERY 

As PD2.0 spec ("6.5.6.2 PSSourceOffTimer")，the PSSourceOffTimer is
used by the Policy Engine in Dual-Role Power device that is currently
acting as a Sink to timeout on a PS_RDY Message during a Power Role
Swap sequence. This condition leads to a Hard Reset for USB Type-A and
Type-B Plugs and Error Recovery for Type-C plugs and return to USB
Default Operation.

Therefore, after PSSourceOffTimer timeout, the tcpm state machine should
switch from PR_SWAP_SNK_SRC_SINK_OFF to ERROR_RECOVERY. This can also
solve the test items in the USB power delivery compliance test:
TEST.PD.PROT.SNK.12 PR_Swap – PSSourceOffTimer Timeout

[1] https://usb.org/document-library/usb-power-delivery-compliance-test-specification-0/USB_PD3_CTS_Q4_2025_OR.zip



Fixes: f0690a25 ("staging: typec: USB Type-C Port Manager (tcpm)")
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarJos Wang <joswang@lenovo.com>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Tested-by: default avatarAmit Sunil Dhamne <amitsd@google.com>
Link: https://lore.kernel.org/r/20250213134921.3798-1-joswang1221@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 634775a7

drivers/usb/typec/tcpm/tcpm.c

+1 −2
Original line number Diff line number Diff line
@@ -5591,8 +5591,7 @@ static void run_state_machine(struct tcpm_port *port) 
		tcpm_set_auto_vbus_discharge_threshold(port, TYPEC_PWR_MODE_USB,

						       port->pps_data.active, 0);

		tcpm_set_charge(port, false);

		tcpm_set_state(port, hard_reset_state(port),

			       port->timings.ps_src_off_time);

		tcpm_set_state(port, ERROR_RECOVERY, port->timings.ps_src_off_time);

		break;

	case PR_SWAP_SNK_SRC_SOURCE_ON:

		tcpm_enable_auto_vbus_discharge(port, true);