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

Merge tag 'thunderbolt-for-v6.8-rc4' of... 

Merge tag 'thunderbolt-for-v6.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus

Mika writes:

thunderbolt: Fix for v6.8-rc4

This includes one USB4/Thunderbolt fix for v6.8-rc4:

  - Correct the CNS (CM TBT3 Not Supported) bit setting for USB4
    routers.

This has been in linux-next with no reported issues.

* tag 'thunderbolt-for-v6.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
  thunderbolt: Fix setting the CNS bit in ROUTER_CS_5
parents 54be6c6c ec4d82f8

drivers/thunderbolt/tb_regs.h

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ struct tb_regs_switch_header { 
#define ROUTER_CS_5_WOP				BIT(1)

#define ROUTER_CS_5_WOU				BIT(2)

#define ROUTER_CS_5_WOD				BIT(3)

#define ROUTER_CS_5_C3S				BIT(23)

#define ROUTER_CS_5_CNS				BIT(23)

#define ROUTER_CS_5_PTO				BIT(24)

#define ROUTER_CS_5_UTO				BIT(25)

#define ROUTER_CS_5_HCO				BIT(26)

drivers/thunderbolt/usb4.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ int usb4_switch_setup(struct tb_switch *sw) 
	}



	/* TBT3 supported by the CM */

	val |= ROUTER_CS_5_C3S;

	val &= ~ROUTER_CS_5_CNS;



	return tb_sw_write(sw, &val, TB_CFG_SWITCH, ROUTER_CS_5, 1);

}