Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752241AbdLEFbm (ORCPT ); Tue, 5 Dec 2017 00:31:42 -0500 Received: from mga04.intel.com ([192.55.52.120]:49104 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752196AbdLEFbk (ORCPT ); Tue, 5 Dec 2017 00:31:40 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,363,1508828400"; d="scan'208";a="183716884" From: Pei Zhang To: linux-kernel@vger.kernel.org Cc: Pei Zhang Subject: [PATCH] usbip: vhci-hcd: return correct port ENABLE status Date: Tue, 5 Dec 2017 13:39:41 +0800 Message-Id: <1512452381-24296-1-git-send-email-pei.zhang@intel.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2224 Lines: 66 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, and a Logitech webcam. Signed-off-by: Pei Zhang --- drivers/usb/usbip/vhci_hcd.c | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c index e4cb9f0..7b8cf70 100644 --- a/drivers/usb/usbip/vhci_hcd.c +++ b/drivers/usb/usbip/vhci_hcd.c @@ -350,24 +350,32 @@ static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, dum->re_timeout = 0; } - if ((dum->port_status[rhport] & (1 << USB_PORT_FEAT_RESET)) != - 0 && time_after(jiffies, dum->re_timeout)) { - dum->port_status[rhport] |= - (1 << USB_PORT_FEAT_C_RESET); - dum->port_status[rhport] &= - ~(1 << USB_PORT_FEAT_RESET); - dum->re_timeout = 0; - - if (dum->vdev[rhport].ud.status == - VDEV_ST_NOTASSIGNED) { - usbip_dbg_vhci_rh( - " enable rhport %d (status %u)\n", - rhport, - dum->vdev[rhport].ud.status); + if (dum->port_status[rhport] & (1 << USB_PORT_FEAT_RESET)) { + if (time_after(jiffies, dum->re_timeout)) { dum->port_status[rhport] |= - USB_PORT_STAT_ENABLE; + (1 << USB_PORT_FEAT_C_RESET); + dum->port_status[rhport] &= + ~(1 << USB_PORT_FEAT_RESET); + dum->re_timeout = 0; + + if (dum->vdev[rhport].ud.status == + VDEV_ST_NOTASSIGNED) { + usbip_dbg_vhci_rh( + " enable rhport %d (status %u)\n", + rhport, + dum->vdev[rhport].ud.status); + dum->port_status[rhport] |= + USB_PORT_STAT_ENABLE; + } } + } else { + /* Port would be disabled by clearing FEAT_ENABLE bit, + * make it enabled here. No more thing should be done. */ + if (dum->vdev[rhport].ud.status == VDEV_ST_USED) + dum->port_status[rhport] |= + USB_PORT_STAT_ENABLE; } + ((__le16 *) buf)[0] = cpu_to_le16(dum->port_status[rhport]); ((__le16 *) buf)[1] = cpu_to_le16(dum->port_status[rhport] >> 16); -- 2.7.4