From: Michael Brown <mcb30@ipxe.org>
Date: Thu, 2 Jul 2020 15:48:17 +0000 (+0100)
Subject: [usb] Do not attempt to disable USB3 hub ports
X-Git-Tag: v1.21.1~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=761ed4365a64ac34443a3de4c0e81e4b9491b33e;p=thirdparty%2Fipxe.git

[usb] Do not attempt to disable USB3 hub ports

The USB3 specification removes PORT_ENABLE from the list of features
that may be cleared via a CLEAR_FEATURE request.  Experimentation
shows that omitting the attempt to clear PORT_ENABLE seems to result
in the correct hotplug behaviour.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/drivers/usb/usbhub.c b/src/drivers/usb/usbhub.c
index cd7815834..28d6cb33d 100644
--- a/src/drivers/usb/usbhub.c
+++ b/src/drivers/usb/usbhub.c
@@ -247,8 +247,10 @@ static int hub_disable ( struct usb_hub *hub, struct usb_port *port ) {
 	int rc;
 
 	/* Disable port */
-	if ( ( rc = usb_hub_clear_port_feature ( usb, port->address,
-						 USB_HUB_PORT_ENABLE, 0 ) )!=0){
+	if ( ( hub->protocol < USB_PROTO_3_0 ) &&
+	     ( ( rc = usb_hub_clear_port_feature ( usb, port->address,
+						   USB_HUB_PORT_ENABLE,
+						   0 ) ) != 0 ) ) {
 		DBGC ( hubdev, "HUB %s port %d could not disable: %s\n",
 		       hubdev->name, port->address, strerror ( rc ) );
 		return rc;