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

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

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

Mika writes:

thunderbolt: Fixes for v6.16-rc4

This includes following USB4/Thunderbolt fixes for v6.16-rc4:

  - Fix wake on connect during runtime suspend
  - Fix bit masking in tb_dp_port_set_hops().

Both have been in linux-next with no reported issues.

* tag 'thunderbolt-for-v6.16-rc4' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
  thunderbolt: Fix bit masking in tb_dp_port_set_hops()
  thunderbolt: Fix wake on connect at runtime
parents 3c2bd251 2cdde91c

drivers/thunderbolt/switch.c

+5 −5
Original line number Diff line number Diff line
@@ -1450,7 +1450,7 @@ int tb_dp_port_set_hops(struct tb_port *port, unsigned int video, 
		return ret;



	data[0] &= ~ADP_DP_CS_0_VIDEO_HOPID_MASK;

	data[1] &= ~ADP_DP_CS_1_AUX_RX_HOPID_MASK;

	data[1] &= ~ADP_DP_CS_1_AUX_TX_HOPID_MASK;

	data[1] &= ~ADP_DP_CS_1_AUX_RX_HOPID_MASK;



	data[0] |= (video << ADP_DP_CS_0_VIDEO_HOPID_SHIFT) &
@@ -3437,7 +3437,7 @@ void tb_sw_set_unplugged(struct tb_switch *sw) 
	}

}



static int tb_switch_set_wake(struct tb_switch *sw, unsigned int flags)

static int tb_switch_set_wake(struct tb_switch *sw, unsigned int flags, bool runtime)

{

	if (flags)

		tb_sw_dbg(sw, "enabling wakeup: %#x\n", flags);
@@ -3445,7 +3445,7 @@ static int tb_switch_set_wake(struct tb_switch *sw, unsigned int flags) 
		tb_sw_dbg(sw, "disabling wakeup\n");



	if (tb_switch_is_usb4(sw))

		return usb4_switch_set_wake(sw, flags);

		return usb4_switch_set_wake(sw, flags, runtime);

	return tb_lc_set_wake(sw, flags);

}
@@ -3521,7 +3521,7 @@ int tb_switch_resume(struct tb_switch *sw, bool runtime) 
		tb_switch_check_wakes(sw);



	/* Disable wakes */

	tb_switch_set_wake(sw, 0);

	tb_switch_set_wake(sw, 0, true);



	err = tb_switch_tmu_init(sw);

	if (err)
@@ -3603,7 +3603,7 @@ void tb_switch_suspend(struct tb_switch *sw, bool runtime) 
		flags |= TB_WAKE_ON_USB4 | TB_WAKE_ON_USB3 | TB_WAKE_ON_PCIE;

	}



	tb_switch_set_wake(sw, flags);

	tb_switch_set_wake(sw, flags, runtime);



	if (tb_switch_is_usb4(sw))

		usb4_switch_set_sleep(sw);

drivers/thunderbolt/tb.h

+1 −1
Original line number Diff line number Diff line
@@ -1317,7 +1317,7 @@ 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,

			  size_t size);

bool usb4_switch_lane_bonding_possible(struct tb_switch *sw);

int usb4_switch_set_wake(struct tb_switch *sw, unsigned int flags);

int usb4_switch_set_wake(struct tb_switch *sw, unsigned int flags, bool runtime);

int usb4_switch_set_sleep(struct tb_switch *sw);

int usb4_switch_nvm_sector_size(struct tb_switch *sw);

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

drivers/thunderbolt/usb4.c

+5 −7
Original line number Diff line number Diff line
@@ -403,12 +403,12 @@ bool usb4_switch_lane_bonding_possible(struct tb_switch *sw) 
 * usb4_switch_set_wake() - Enabled/disable wake

 * @sw: USB4 router

 * @flags: Wakeup flags (%0 to disable)

 * @runtime: Wake is being programmed during system runtime

 *

 * Enables/disables router to wake up from sleep.

 */

int usb4_switch_set_wake(struct tb_switch *sw, unsigned int flags)

int usb4_switch_set_wake(struct tb_switch *sw, unsigned int flags, bool runtime)

{

	struct usb4_port *usb4;

	struct tb_port *port;

	u64 route = tb_route(sw);

	u32 val;
@@ -438,13 +438,11 @@ int usb4_switch_set_wake(struct tb_switch *sw, unsigned int flags) 
			val |= PORT_CS_19_WOU4;

		} else {

			bool configured = val & PORT_CS_19_PC;

			usb4 = port->usb4;

			bool wakeup = runtime || device_may_wakeup(&port->usb4->dev);



			if (((flags & TB_WAKE_ON_CONNECT) &&

			      device_may_wakeup(&usb4->dev)) && !configured)

			if ((flags & TB_WAKE_ON_CONNECT) && wakeup && !configured)

				val |= PORT_CS_19_WOC;

			if (((flags & TB_WAKE_ON_DISCONNECT) &&

			      device_may_wakeup(&usb4->dev)) && configured)

			if ((flags & TB_WAKE_ON_DISCONNECT) && wakeup && configured)

				val |= PORT_CS_19_WOD;

			if ((flags & TB_WAKE_ON_USB4) && configured)

				val |= PORT_CS_19_WOU4;