Commit 23ccd21c authored by Gil Fine's avatar Gil Fine Committed by Mika Westerberg
Browse files

thunderbolt: Implement TMU time disruption for Intel Titan Ridge 



Intel Titan Ridge based routers have slightly different flow for time
disruption than USB4 compliant routers. This makes it work on Titan
Ridge too. Needed to enable link low power states on Titan Ridge.

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

drivers/thunderbolt/switch.c

+4 −0
Original line number Diff line number Diff line
@@ -2228,6 +2228,10 @@ struct tb_switch *tb_switch_alloc(struct tb *tb, struct device *parent, 
	if (ret > 0)

		sw->cap_plug_events = ret;



	ret = tb_switch_find_vse_cap(sw, TB_VSE_CAP_TIME2);

	if (ret > 0)

		sw->cap_vsec_tmu = ret;



	ret = tb_switch_find_vse_cap(sw, TB_VSE_CAP_LINK_CONTROLLER);

	if (ret > 0)

		sw->cap_lc = ret;

drivers/thunderbolt/tb.h

+2 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ enum tb_clx { 
 * @link_usb4: Upstream link is USB4

 * @generation: Switch Thunderbolt generation

 * @cap_plug_events: Offset to the plug events capability (%0 if not found)

 * @cap_vsec_tmu: Offset to the TMU vendor specific capability (%0 if not found)

 * @cap_lc: Offset to the link controller capability (%0 if not found)

 * @is_unplugged: The switch is going away

 * @drom: DROM of the switch (%NULL if not found)
@@ -189,6 +190,7 @@ struct tb_switch { 
	bool link_usb4;

	unsigned int generation;

	int cap_plug_events;

	int cap_vsec_tmu;

	int cap_lc;

	bool is_unplugged;

	u8 *drom;

drivers/thunderbolt/tb_regs.h

+4 −0
Original line number Diff line number Diff line
@@ -446,6 +446,10 @@ struct tb_regs_hop { 
	u32 unknown3:3; /* set to zero */

} __packed;



/* TMU Thunderbolt 3 registers */

#define TB_TIME_VSEC_3_CS_26		0x1a

#define TB_TIME_VSEC_3_CS_26_TD		BIT(22)



/* Common link controller registers */

#define TB_LC_DESC			0x02

#define TB_LC_DESC_NLC_MASK		GENMASK(3, 0)

drivers/thunderbolt/tmu.c

+13 −7
Original line number Diff line number Diff line
@@ -152,21 +152,27 @@ static int tb_port_tmu_time_sync_enable(struct tb_port *port) 


static int tb_switch_tmu_set_time_disruption(struct tb_switch *sw, bool set)

{

	u32 val, offset, bit;

	int ret;

	u32 val;



	ret = tb_sw_read(sw, &val, TB_CFG_SWITCH,

			 sw->tmu.cap + TMU_RTR_CS_0, 1);

	if (tb_switch_is_usb4(sw)) {

		offset = sw->tmu.cap + TMU_RTR_CS_0;

		bit = TMU_RTR_CS_0_TD;

	} else {

		offset = sw->cap_vsec_tmu + TB_TIME_VSEC_3_CS_26;

		bit = TB_TIME_VSEC_3_CS_26_TD;

	}



	ret = tb_sw_read(sw, &val, TB_CFG_SWITCH, offset, 1);

	if (ret)

		return ret;



	if (set)

		val |= TMU_RTR_CS_0_TD;

		val |= bit;

	else

		val &= ~TMU_RTR_CS_0_TD;

		val &= ~bit;



	return tb_sw_write(sw, &val, TB_CFG_SWITCH,

			   sw->tmu.cap + TMU_RTR_CS_0, 1);

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

}



/**