From: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx> commit bf791751162ac875a9439426d13f8d4d18151549 upstream. Normally there is no need to enumerate retimers on the other side of the cable. This is only needed in special cases where user wants to run receiver lane margining against the downstream facing port of a retimer. Furthermore this might confuse the userspace tools such as fwupd because it cannot read the information it expects from these retimers. Fix this by changing the retimer enumeration code to add only on-board retimers when CONFIG_USB4_DEBUGFS_MARGINING is not enabled. Reported-by: AceLan Kao <acelan.kao@xxxxxxxxxxxxx> Tested-by: AceLan Kao <acelan.kao@xxxxxxxxxxxxx> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219420 Cc: stable@xxxxxxxxxxxxxxx Fixes: ff6ab055e070 ("thunderbolt: Add receiver lane margining support for retimers") Signed-off-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/thunderbolt/retimer.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/thunderbolt/retimer.c +++ b/drivers/thunderbolt/retimer.c @@ -532,6 +532,8 @@ int tb_retimer_scan(struct tb_port *port } ret = 0; + if (!IS_ENABLED(CONFIG_USB4_DEBUGFS_MARGINING)) + max = min(last_idx, max); /* Add retimers if they do not exist already */ for (i = 1; i <= max; i++) { Patches currently in stable-queue which might be from mika.westerberg@xxxxxxxxxxxxxxx are queue-6.11/thunderbolt-add-only-on-board-retimers-when-config_usb4_debugfs_margining.patch
