Commit 14200a26 authored by Gil Fine's avatar Gil Fine Committed by Mika Westerberg
Browse files

thunderbolt: Announce USB4 v2 connection manager support 



Program the CMUV (Connection Manager USB4 Version) field for USB4 v2 and
v1 routers according to the spec.

Signed-off-by: default avatarGil Fine <gil.fine@intel.com>
Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent 0fc70886

drivers/thunderbolt/switch.c

+6 −2
Original line number Diff line number Diff line
@@ -2430,9 +2430,13 @@ int tb_switch_configure(struct tb_switch *sw) 
		/*

		 * For USB4 devices, we need to program the CM version

		 * accordingly so that it knows to expose all the

		 * additional capabilities.

		 * additional capabilities. Program it according to USB4

		 * version to avoid changing existing (v1) routers behaviour.

		 */

		sw->config.cmuv = USB4_VERSION_1_0;

		if (usb4_switch_version(sw) < 2)

			sw->config.cmuv = ROUTER_CS_4_CMUV_V1;

		else

			sw->config.cmuv = ROUTER_CS_4_CMUV_V2;

		sw->config.plug_events_delay = 0xa;



		/* Enumerate the switch */

drivers/thunderbolt/tb_regs.h

+3 −0
Original line number Diff line number Diff line
@@ -195,6 +195,9 @@ struct tb_regs_switch_header { 


#define ROUTER_CS_1				0x01

#define ROUTER_CS_4				0x04

/* Used with the router cmuv field */

#define ROUTER_CS_4_CMUV_V1			0x10

#define ROUTER_CS_4_CMUV_V2			0x20

#define ROUTER_CS_5				0x05

#define ROUTER_CS_5_SLP				BIT(0)

#define ROUTER_CS_5_WOP				BIT(1)