Merge tag 'thunderbolt-for-v6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

Mika writes:

thunderbolt: Changes for v6.7 merge window

This includes following USB4/Thunderbolt changes for the v6.7 merge
window:

  - Configure asymmetric link if the DisplayPort bandwidth requires so
  - Enable path power management packet support for USB4 v2 routers
  - Make the bandwidth reservations to follow the USB4 v2 connection
    manager guide suggestions
  - DisplayPort tunneling improvements
  - Small cleanups and improvements around the driver.

All these have been in linux-next with no reported issues.

* tag 'thunderbolt-for-v6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt: (25 commits)
  thunderbolt: Fix one kernel-doc comment
  thunderbolt: Configure asymmetric link if needed and bandwidth allows
  thunderbolt: Add support for asymmetric link
  thunderbolt: Introduce tb_switch_depth()
  thunderbolt: Introduce tb_for_each_upstream_port_on_path()
  thunderbolt: Introduce tb_port_path_direction_downstream()
  thunderbolt: Set path power management packet support bit for USB4 v2 routers
  thunderbolt: Change bandwidth reservations to comply USB4 v2
  thunderbolt: Make is_gen4_link() available to the rest of the driver
  thunderbolt: Use weight constants in tb_usb3_consumed_bandwidth()
  thunderbolt: Use constants for path weight and priority
  thunderbolt: Add DP IN added last in the head of the list of DP resources
  thunderbolt: Create multiple DisplayPort tunnels if there are more DP IN/OUT pairs
  thunderbolt: Log NVM version of routers and retimers
  thunderbolt: Use tb_tunnel_xxx() log macros in tb.c
  thunderbolt: Expose tb_tunnel_xxx() log macros to the rest of the driver
  thunderbolt: Use tb_tunnel_dbg() where possible to make logging more consistent
  thunderbolt: Fix typo of HPD bit for Hot Plug Detect
  thunderbolt: Fix typo in enum tb_link_width kernel-doc
  thunderbolt: Fix debug log when DisplayPort adapter not available for pairing
  ...

diff --cc drivers/thunderbolt/switch.c
index bd5815f8f23bd61a92fd45b8e263e4b8acb067f5,e09ac36f71a7a964ec239d2cb280c67db328f54e..1e15ffa792955d7382b19546226bdcfa603a5685
--- 1/drivers/thunderbolt/switch.c
--- 2/drivers/thunderbolt/switch.c
+++ b/drivers/thunderbolt/switch.c
@@@ -2721,17 -2811,10 +2811,17 @@@ static int tb_switch_lane_bonding_enabl
        up = tb_upstream_port(sw);
        down = tb_switch_downstream_port(sw);
  
-       if (!tb_port_is_width_supported(up, TB_LINK_WIDTH_DUAL) ||
-           !tb_port_is_width_supported(down, TB_LINK_WIDTH_DUAL))
+       if (!tb_port_width_supported(up, TB_LINK_WIDTH_DUAL) ||
+           !tb_port_width_supported(down, TB_LINK_WIDTH_DUAL))
                return 0;
  
 +      /*
 +       * Both lanes need to be in CL0. Here we assume lane 0 already be in
 +       * CL0 and check just for lane 1.
 +       */
 +      if (tb_wait_for_port(down->dual_link_port, false) <= 0)
 +              return -ENOTCONN;
 +
        ret = tb_port_lane_bonding_enable(up);
        if (ret) {
                tb_port_warn(up, "failed to enable lane bonding\n");