Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f0a6cd3 authored by Andiry Xu's avatar Andiry Xu Committed by Greg Kroah-Hartman
Browse files

USB: usbcore: Do not disable USB3 protocol ports in hub_activate() 



When USB3 protocol port detects an USB3.0 device attach, the port will
automatically transition to the Enabled state upon the completion
of successful link training.

Do not disable USB3 protocol ports in hub_activate(), or USB3.0 device
will fail to be recognized if xHCI bus power management is implemented.

Signed-off-by: default avatarAndiry Xu <andiry.xu@amd.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 82b71cfd

drivers/usb/core/hub.c

+14 −2
Original line number Diff line number Diff line
@@ -744,9 +744,21 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type) 
				!(portstatus & USB_PORT_STAT_CONNECTION) ||

				!udev ||

				udev->state == USB_STATE_NOTATTACHED)) {

			clear_port_feature(hdev, port1, USB_PORT_FEAT_ENABLE);

			/*

			 * USB3 protocol ports will automatically transition

			 * to Enabled state when detect an USB3.0 device attach.

			 * Do not disable USB3 protocol ports.

			 * FIXME: USB3 root hub and external hubs are treated

			 * differently here.

			 */

			if (hdev->descriptor.bDeviceProtocol != 3 ||

			    (!hdev->parent &&

			     !(portstatus & USB_PORT_STAT_SUPER_SPEED))) {

				clear_port_feature(hdev, port1,

						   USB_PORT_FEAT_ENABLE);

				portstatus &= ~USB_PORT_STAT_ENABLE;

			}

		}



		/* Clear status-change flags; we'll debounce later */

		if (portchange & USB_PORT_STAT_C_CONNECTION) {