This is a note to let you know that I've just added the patch titled usb: pd: Set PD_T_SINK_WAIT_CAP to 310ms to the 5.12-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: usb-pd-set-pd_t_sink_wait_cap-to-310ms.patch and it can be found in the queue-5.12 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 6490fa565534fa83593278267785a694fd378a2b Mon Sep 17 00:00:00 2001 From: Kyle Tso <kyletso@xxxxxxxxxx> Date: Fri, 28 May 2021 16:16:13 +0800 Subject: usb: pd: Set PD_T_SINK_WAIT_CAP to 310ms From: Kyle Tso <kyletso@xxxxxxxxxx> commit 6490fa565534fa83593278267785a694fd378a2b upstream. Current timer PD_T_SINK_WAIT_CAP is set to 240ms which will violate the SinkWaitCapTimer (tTypeCSinkWaitCap 310 - 620 ms) defined in the PD Spec if the port is faster enough when running the state machine. Set it to the lower bound 310ms to ensure the timeout is in Spec. Fixes: f0690a25a140 ("staging: typec: USB Type-C Port Manager (tcpm)") Cc: stable <stable@xxxxxxxxxxxxxxx> Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx> Signed-off-by: Kyle Tso <kyletso@xxxxxxxxxx> Link: https://lore.kernel.org/r/20210528081613.730661-1-kyletso@xxxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- include/linux/usb/pd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/include/linux/usb/pd.h +++ b/include/linux/usb/pd.h @@ -460,7 +460,7 @@ static inline unsigned int rdo_max_power #define PD_T_RECEIVER_RESPONSE 15 /* 15ms max */ #define PD_T_SOURCE_ACTIVITY 45 #define PD_T_SINK_ACTIVITY 135 -#define PD_T_SINK_WAIT_CAP 240 +#define PD_T_SINK_WAIT_CAP 310 /* 310 - 620 ms */ #define PD_T_PS_TRANSITION 500 #define PD_T_SRC_TRANSITION 35 #define PD_T_DRP_SNK 40 Patches currently in stable-queue which might be from kyletso@xxxxxxxxxx are queue-5.12/usb-pd-set-pd_t_sink_wait_cap-to-310ms.patch queue-5.12/usb-typec-tcpm-properly-handle-alert-and-status-messages.patch queue-5.12/usb-typec-tcpm-do-not-finish-vdm-ams-for-retrying-responses.patch