From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 7 Nov 2024 15:11:57 +0000 (+0100)
Subject: Merge tag 'thunderbolt-for-v6.12-rc7' of ssh://gitolite.kernel.org/pub/scm/linux... 
X-Git-Tag: microblaze-v6.16~731^2~1
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=0c08402f64729e7ce5d082c4d04b4f20b7cf247f;p=linux-2.6-microblaze.git

Merge tag 'thunderbolt-for-v6.12-rc7' of ssh://gitolite./linux/kernel/git/westeri/thunderbolt into usb-linus

thunderbolt: Fixes for v6.12-rc7

This includes following USB4/Thunderbolt fixes for v6.12-rc7:

  - Fix for retimer enumeration.
  - Fix connection issue with Pluggable UD-4VPD USB4 dock.

Both have been in linux-next with no reported issues.

* tag 'thunderbolt-for-v6.12-rc7' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
  thunderbolt: Fix connection issue with Pluggable UD-4VPD dock
  thunderbolt: Add only on-board retimers when !CONFIG_USB4_DEBUGFS_MARGINING
---

0c08402f64729e7ce5d082c4d04b4f20b7cf247f
diff --cc drivers/thunderbolt/retimer.c
index 7db9869a9f3f,bdf641489f82..89d2919d0193
--- a/drivers/thunderbolt/retimer.c
+++ b/drivers/thunderbolt/retimer.c
@@@ -527,11 -527,12 +527,13 @@@ int tb_retimer_scan(struct tb_port *por
  			last_idx = i;
  		else if (ret < 0)
  			break;
 +
 +		max = i;
  	}
  
 -	max = i;
  	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++) {