[PATCH V2] USBIP: return correct port ENABLE status

[pei . zhang]

From: Pei Zhang <pei.zhang@xxxxxxxxx>

USB system will clear port's ENABLE feature for some USB devices when
vdev is already assigned port address. This cause getPortStatus reports
to system that this device is not enabled, client OS will failed to use
this usb device.

The failure devices include a SAMSUNG SSD storage, Logitech webcam C920.

V2: send again to all related maintainers.

Signed-off-by: Pei Zhang <pei.zhang@xxxxxxxxx>
---
 drivers/usb/usbip/vhci_hcd.c | 63 ++++++++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 28 deletions(-)

diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
index 713e941..7970bab 100644
--- a/drivers/usb/usbip/vhci_hcd.c
+++ b/drivers/usb/usbip/vhci_hcd.c
@@ -430,38 +430,45 @@ static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
 			vhci_hcd->re_timeout = 0;
 		}
 
-		if ((vhci_hcd->port_status[rhport] & (1 << USB_PORT_FEAT_RESET)) !=
-		    0 && time_after(jiffies, vhci_hcd->re_timeout)) {
-			vhci_hcd->port_status[rhport] |= (1 << USB_PORT_FEAT_C_RESET);
-			vhci_hcd->port_status[rhport] &= ~(1 << USB_PORT_FEAT_RESET);
-			vhci_hcd->re_timeout = 0;
-
-			if (vhci_hcd->vdev[rhport].ud.status ==
-			    VDEV_ST_NOTASSIGNED) {
-				usbip_dbg_vhci_rh(
-					" enable rhport %d (status %u)\n",
-					rhport,
-					vhci_hcd->vdev[rhport].ud.status);
-				vhci_hcd->port_status[rhport] |=
-					USB_PORT_STAT_ENABLE;
-			}
-
-			if (hcd->speed < HCD_USB3) {
-				switch (vhci_hcd->vdev[rhport].speed) {
-				case USB_SPEED_HIGH:
-					vhci_hcd->port_status[rhport] |=
-					      USB_PORT_STAT_HIGH_SPEED;
-					break;
-				case USB_SPEED_LOW:
+		if ((vhci_hcd->port_status[rhport] & (1 << USB_PORT_FEAT_RESET))) {
+			if (time_after(jiffies, vhci_hcd->re_timeout)) {
+				vhci_hcd->port_status[rhport] |= (1 << USB_PORT_FEAT_C_RESET);
+				vhci_hcd->port_status[rhport] &= ~(1 << USB_PORT_FEAT_RESET);
+				vhci_hcd->re_timeout = 0;
+
+				if (vhci_hcd->vdev[rhport].ud.status ==
+						VDEV_ST_NOTASSIGNED) {
+					usbip_dbg_vhci_rh(
+						" enable rhport %d (status %u)\n",
+						rhport,	vhci_hcd->vdev[rhport].ud.status);
 					vhci_hcd->port_status[rhport] |=
-						USB_PORT_STAT_LOW_SPEED;
-					break;
-				default:
-					pr_err("vhci_device speed not set\n");
-					break;
+						USB_PORT_STAT_ENABLE;
+				}
+
+				if (hcd->speed < HCD_USB3) {
+					switch (vhci_hcd->vdev[rhport].speed) {
+					case USB_SPEED_HIGH:
+						vhci_hcd->port_status[rhport] |=
+							USB_PORT_STAT_HIGH_SPEED;
+						break;
+					case USB_SPEED_LOW:
+						vhci_hcd->port_status[rhport] |=
+							USB_PORT_STAT_LOW_SPEED;
+						break;
+					default:
+						pr_err("vhci_device speed not set\n");
+						break;
+					}
 				}
 			}
+		} else {
+			/* Port would be disabled by clearing FEAT_ENABLE,
+			 * make it enabled again here.
+			 */
+			if (vhci_hcd->vdev[rhport].ud.status == VDEV_ST_USED)
+				vhci_hcd->port_status[rhport] |= USB_PORT_STAT_ENABLE;
 		}
+
 		((__le16 *) buf)[0] = cpu_to_le16(vhci_hcd->port_status[rhport]);
 		((__le16 *) buf)[1] =
 			cpu_to_le16(vhci_hcd->port_status[rhport] >> 16);
-- 
2.7.4