On Fri, Apr 11, 2025 at 10:14:44AM -0500, Mario Limonciello wrote:

From: Mario Limonciello mario.limonciello@amd.com

commit a5cfc9d65879c ("thunderbolt: Add wake on connect/disconnect on USB4 ports") introduced a sysfs file to control wake up policy for a given USB4 port that defaulted to disabled.

However when testing commit 4bfeea6ec1c02 ("thunderbolt: Use wake on connect and disconnect over suspend") I found that it was working even without making changes to the power/wakeup file (which defaults to disabled). This is because of a logic error doing a bitwise or of the wake-on-connect flag with device_may_wakeup() which should have been a logical AND.

Adjust the logic so that policy is only applied when wakeup is actually enabled.

Fixes: a5cfc9d65879c ("thunderbolt: Add wake on connect/disconnect on USB4 ports") Signed-off-by: Mario Limonciello mario.limonciello@amd.com

Hi! There have been a couple of reports of a Thunderbolt regression in recent stable kernels, and one reporter has now bisected it to this change:

• https://bugzilla.kernel.org/show_bug.cgi?id=220284 • https://github.com/NixOS/nixpkgs/issues/420730

Both reporters are CCed, and say it starts working after the module is reloaded.

Link: https://lore.kernel.org/r/bug-220284-208809@https.bugzilla.kernel.org%2F/ (for regzbot)

---

drivers/thunderbolt/usb4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/thunderbolt/usb4.c b/drivers/thunderbolt/usb4.c index e51d01671d8e7..3e96f1afd4268 100644 --- a/drivers/thunderbolt/usb4.c +++ b/drivers/thunderbolt/usb4.c @@ -440,10 +440,10 @@ int usb4_switch_set_wake(struct tb_switch *sw, unsigned int flags) bool configured = val & PORT_CS_19_PC; usb4 = port->usb4;

• 	if (((flags & TB_WAKE_ON_CONNECT) |
  

• 	if (((flags & TB_WAKE_ON_CONNECT) &&
        device_may_wakeup(&usb4->dev)) && !configured)
  	val |= PORT_CS_19_WOC;
  

• 	if (((flags & TB_WAKE_ON_DISCONNECT) |
  

• 	if (((flags & TB_WAKE_ON_DISCONNECT) &&
        device_may_wakeup(&usb4->dev)) && configured)
  	val |= PORT_CS_19_WOD;
  if ((flags & TB_WAKE_ON_USB4) && configured)
  

-- 2.43.0