Commit 9c9a23cc authored by Dominik Bozek's avatar Dominik Bozek Committed by Kleber Sacilotto de Souza

usb: hub: Don't wait for connect state at resume for powered-off ports

BugLink: https://bugs.launchpad.net/bugs/1791953

[ Upstream commit 5d111f51 ]

wait_for_connected() wait till a port change status to
USB_PORT_STAT_CONNECTION, but this is not possible if
the port is unpowered. The loop will only exit at timeout.

Such case take place if an over-current incident happen
while system is in S3. Then during resume wait_for_connected()
will wait 2s, which may be noticeable by the user.
Signed-off-by: default avatarDominik Bozek <dominikx.bozek@intel.com>
Signed-off-by: default avatarKuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent d61f0327
...@@ -3360,6 +3360,10 @@ static int wait_for_ss_port_enable(struct usb_device *udev, ...@@ -3360,6 +3360,10 @@ static int wait_for_ss_port_enable(struct usb_device *udev,
while (delay_ms < 2000) { while (delay_ms < 2000) {
if (status || *portstatus & USB_PORT_STAT_CONNECTION) if (status || *portstatus & USB_PORT_STAT_CONNECTION)
break; break;
if (!port_is_power_on(hub, *portstatus)) {
status = -ENODEV;
break;
}
msleep(20); msleep(20);
delay_ms += 20; delay_ms += 20;
status = hub_port_status(hub, *port1, portstatus, portchange); status = hub_port_status(hub, *port1, portstatus, portchange);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment