Commit 0c08402f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'thunderbolt-for-v6.12-rc7' of... 

Merge tag 'thunderbolt-for-v6.12-rc7' of ssh://gitolite.kernel.org/pub/scm/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
parents 7dd08a0b bd646c76

drivers/thunderbolt/retimer.c

+2 −0
Original line number Diff line number Diff line
@@ -532,6 +532,8 @@ int tb_retimer_scan(struct tb_port *port, bool add) 
	}



	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++) {

drivers/thunderbolt/usb4.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ enum usb4_ba_index { 


/* Delays in us used with usb4_port_wait_for_bit() */

#define USB4_PORT_DELAY			50

#define USB4_PORT_SB_DELAY		5000

#define USB4_PORT_SB_DELAY		1000



static int usb4_native_switch_op(struct tb_switch *sw, u16 opcode,

				 u32 *metadata, u8 *status,