MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-07-05 21:35:46 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

thunderbolt: Fix a logic error in wake on connect

Browse Source 
[ Upstream commit 1a760d10ded372d113a0410c42be246315bbc2ff ]

commit a5cfc9d658 ("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: a5cfc9d658 ("thunderbolt: Add wake on connect/disconnect on USB4 ports")
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Mario Limonciello 2025-04-11 10:14:44 -05:00 committed by Greg Kroah-Hartman
parent a6c7c36573
commit f2829faa3f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/thunderbolt/usb4.c
View File

@ -442,10 +442,10 @@ int usb4_switch_set_wake(struct tb_switch *sw, unsigned int flags)
bool configured = val & PORT_CS_19_PC; bool configured = val & PORT_CS_19_PC;
usb4 = port->usb4; usb4 = port->usb4;
if (((flags & TB_WAKE_ON_CONNECT) | if (((flags & TB_WAKE_ON_CONNECT) &&
device_may_wakeup(&usb4->dev)) && !configured) device_may_wakeup(&usb4->dev)) && !configured)
val |= PORT_CS_19_WOC; val |= PORT_CS_19_WOC;
if (((flags & TB_WAKE_ON_DISCONNECT) | if (((flags & TB_WAKE_ON_DISCONNECT) &&
device_may_wakeup(&usb4->dev)) && configured) device_may_wakeup(&usb4->dev)) && configured)
val |= PORT_CS_19_WOD; val |= PORT_CS_19_WOD;
if ((flags & TB_WAKE_ON_USB4) && configured) if ((flags & TB_WAKE_ON_USB4) && configured)