Commit 58d71d42 authored by Mario Limonciello's avatar Mario Limonciello Committed by Mika Westerberg
Browse files

thunderbolt: Fix wake on connect at runtime 



commit 1a760d10 ("thunderbolt: Fix a logic error in wake on connect")
fixated on the USB4 port sysfs wakeup file not working properly to control
policy, but it had an unintended side effect that the sysfs file controls
policy both at runtime and at suspend time. The sysfs file is supposed to
only control behavior while system is suspended.

Pass whether programming a port for runtime into usb4_switch_set_wake()
and if runtime then ignore the value in the sysfs file.

Cc: stable@vger.kernel.org
Reported-by: default avatarAlexander Kovacs <Alexander.Kovacs@amd.com>
Tested-by: default avatarAlexander Kovacs <Alexander.Kovacs@amd.com>
Fixes: 1a760d10 ("thunderbolt: Fix a logic error in wake on connect")
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent 86731a2a

drivers/thunderbolt/switch.c

+4 −4
Original line number Diff line number Diff line
@@ -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;