Commit 6e21007d authored by Gil Fine's avatar Gil Fine Committed by Mika Westerberg
Browse files

thunderbolt: Identify USB4 v2 routers 



Add a new function usb4_switch_version() that can be used to figure out
the spec version of the router and make tb_switch_is_usb4() to use it as
well. Update the uevent accordingly.

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

drivers/thunderbolt/switch.c

+3 −2
Original line number Diff line number Diff line
@@ -2056,8 +2056,9 @@ static int tb_switch_uevent(const struct device *dev, struct kobj_uevent_env *en 
	const struct tb_switch *sw = tb_to_switch(dev);

	const char *type;



	if (sw->config.thunderbolt_version == USB4_VERSION_1_0) {

		if (add_uevent_var(env, "USB4_VERSION=1.0"))

	if (tb_switch_is_usb4(sw)) {

		if (add_uevent_var(env, "USB4_VERSION=%u.0",

				   usb4_switch_version(sw)))

			return -ENOMEM;

	}

drivers/thunderbolt/tb.h

+23 −11
Original line number Diff line number Diff line
@@ -947,17 +947,6 @@ static inline bool tb_switch_is_tiger_lake(const struct tb_switch *sw) 
	return false;

}



/**

 * tb_switch_is_usb4() - Is the switch USB4 compliant

 * @sw: Switch to check

 *

 * Returns true if the @sw is USB4 compliant router, false otherwise.

 */

static inline bool tb_switch_is_usb4(const struct tb_switch *sw)

{

	return sw->config.thunderbolt_version == USB4_VERSION_1_0;

}



/**

 * tb_switch_is_icm() - Is the switch handled by ICM firmware

 * @sw: Switch to check
@@ -1198,6 +1187,29 @@ static inline struct tb_retimer *tb_to_retimer(struct device *dev) 
	return NULL;

}



/**

 * usb4_switch_version() - Returns USB4 version of the router

 * @sw: Router to check

 *

 * Returns major version of USB4 router (%1 for v1, %2 for v2 and so

 * on). Can be called to pre-USB4 router too and in that case returns %0.

 */

static inline unsigned int usb4_switch_version(const struct tb_switch *sw)

{

	return FIELD_GET(USB4_VERSION_MAJOR_MASK, sw->config.thunderbolt_version);

}



/**

 * tb_switch_is_usb4() - Is the switch USB4 compliant

 * @sw: Switch to check

 *

 * Returns true if the @sw is USB4 compliant router, false otherwise.

 */

static inline bool tb_switch_is_usb4(const struct tb_switch *sw)

{

	return usb4_switch_version(sw) > 0;

}



int usb4_switch_setup(struct tb_switch *sw);

int usb4_switch_read_uid(struct tb_switch *sw, u64 *uid);

int usb4_switch_drom_read(struct tb_switch *sw, unsigned int address, void *buf,

drivers/thunderbolt/tb_regs.h

+2 −2
Original line number Diff line number Diff line
@@ -190,8 +190,8 @@ struct tb_regs_switch_header { 
	u32 thunderbolt_version:8;

} __packed;



/* USB4 version 1.0 */

#define USB4_VERSION_1_0			0x20

/* Used with the router thunderbolt_version */

#define USB4_VERSION_MAJOR_MASK			GENMASK(7, 5)



#define ROUTER_CS_1				0x01

#define ROUTER_CS_4				0x04