USBIP: return correct port ENABLE status
Subsystems (2)
PATCH v2 1/1 USBIP: return correct port ENABLE status
From: Pei Zhang <[email protected]>
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.
--- drivers/usb/usbip/vhci_hcd.c | 63 ++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 28 deletions(-)
drivers/usb/usbip/vhci_hcd.c +35 -28
@@ -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 );
Signature · 1 line
2.7.4
Shuah Khan
maintainerQuoted 7 lines · On 12/18/2017 11:00 PM, [email protected] wrote:
From: Pei Zhang <[email protected]>
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.
Quoted 5 lines
The failure devices include a SAMSUNG SSD storage, Logitech webcam C920.
V2: send again to all related maintainers.
Signed-off-by Pei Zhang <[email protected]>
Hi Pei Zhang,
Can you elaborate on how you can trigger this condition? Can you send me more information on how to recreate the problem and demsg from server and client side when this problem happens.
thanks,
-- Shuah
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Shuah,
Thanks for your response. It's on KVM hypervisor platform, while the Dom0 is the usbip server, and a DomU act as the client. This issue could be 100% reproduced with the specified devices referred in my patch comment.
I will prepare the environment and then send you related information later.
********* *****
BRs,
Pei Zhang
Quoted 32 lines
-----Original Message-----
From: Shuah Khan [mailto:[email protected]]
Sent: Wednesday, January 10, 2018 1:44 AM
To: Zhang, Pei <[email protected]>; [email protected]; [email protected]
Cc: [email protected]; [email protected]; Shuah Khan <[email protected]>; Shuah Khan <[email protected]>
Subject: Re: [PATCH V2] USBIP: return correct port ENABLE statusQuoted 8 lines · On 12/18/2017 11:00 PM, [email protected] wrote:
From: Pei Zhang <[email protected]>
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.
Quoted 4 lines
V2: send again to all related maintainers.
Signed-off-by Pei Zhang <[email protected]>Hi Pei Zhang,
Can you elaborate on how you can trigger this condition? Can you send me more information on how to recreate the problem and demsg from server and client side when this problem happens.
thanks,
-- Shuah