This is a note to let you know that I've just added the patch titled
thunderbolt: Increase DisplayPort Connection Manager handshake timeout
to the 6.3-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:
thunderbolt-increase-displayport-connection-manager-handshake-timeout.patch
and it can be found in the queue-6.3 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From b6d572aeb58a5e0be86bd51ea514c4feba996cc4 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
Date: Wed, 24 May 2023 10:41:57 +0300
Subject: thunderbolt: Increase DisplayPort Connection Manager handshake timeout
From: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
commit b6d572aeb58a5e0be86bd51ea514c4feba996cc4 upstream.
It turns out that when plugging in VGA cable through USB-C to VGA/DVI
dongle the Connection Manager handshake can take longer time, at least
on Intel Titan Ridge based docks such as Dell WD91TB. This leads to
following error in the dmesg:
thunderbolt 0000:00:0d.3: 3:10: DP tunnel activation failed, aborting
and the display stays blank (because we failed to establish the tunnel).
For this reason increase the timeout to 3s.
Reported-by: Koba Ko <koba.ko@xxxxxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Acked-By: Yehezkel Bernat <YehezkelShB@xxxxxxxxx>
Signed-off-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/thunderbolt/tunnel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/thunderbolt/tunnel.c
+++ b/drivers/thunderbolt/tunnel.c
@@ -526,7 +526,7 @@ static int tb_dp_xchg_caps(struct tb_tun
* Perform connection manager handshake between IN and OUT ports
* before capabilities exchange can take place.
*/
- ret = tb_dp_cm_handshake(in, out, 1500);
+ ret = tb_dp_cm_handshake(in, out, 3000);
if (ret)
return ret;
Patches currently in stable-queue which might be from mika.westerberg@xxxxxxxxxxxxxxx are
queue-6.3/pci-dpc-quirk-pio-log-size-for-intel-ice-lake-root-p.patch
queue-6.3/thunderbolt-do-not-touch-cl-state-configuration-during-discovery.patch
queue-6.3/thunderbolt-mask-ring-interrupt-on-intel-hardware-as-well.patch
queue-6.3/thunderbolt-dma_test-use-correct-value-for-absent-rings-when-creating-paths.patch
queue-6.3/thunderbolt-increase-displayport-connection-manager-handshake-timeout.patch
