diff options
| author | Mathias Nyman | 2015-10-01 17:40:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-10-04 11:34:17 +0200 |
| commit | 7117522520b9101af7a0602d6b0d1e67d689fc6b (patch) | |
| tree | 9984a45bd8823da13b9432278b4a72d4d9c2ce44 | |
| parent | xhci: define the new default speed ID for SuperSpeedPlus used by xhci hw (diff) | |
| download | kernel-qcow2-linux-7117522520b9101af7a0602d6b0d1e67d689fc6b.tar.gz kernel-qcow2-linux-7117522520b9101af7a0602d6b0d1e67d689fc6b.tar.xz kernel-qcow2-linux-7117522520b9101af7a0602d6b0d1e67d689fc6b.zip | |
usb: define HCD_USB31 speed option for hosts that support USB 3.1 features
Hosts that support USB 3.1 Enhaned SuperSpeed can set their speed to
HCD_USB31 to let usb core and host drivers know that the controller
supports new USB 3.1 features.
make sure usb core handle HCD_USB31 hosts correctly, for now similar
to HCD_USB3.
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/core/hcd.c | 3 | ||||
| -rw-r--r-- | include/linux/usb/hcd.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index 86b3d1190500..a02d3e68476e 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -555,6 +555,7 @@ static int rh_call_control (struct usb_hcd *hcd, struct urb *urb) switch (wValue & 0xff00) { case USB_DT_DEVICE << 8: switch (hcd->speed) { + case HCD_USB31: case HCD_USB3: bufp = usb3_rh_dev_descriptor; break; @@ -576,6 +577,7 @@ static int rh_call_control (struct usb_hcd *hcd, struct urb *urb) break; case USB_DT_CONFIG << 8: switch (hcd->speed) { + case HCD_USB31: case HCD_USB3: bufp = ss_rh_config_descriptor; len = sizeof ss_rh_config_descriptor; @@ -2775,6 +2777,7 @@ int usb_add_hcd(struct usb_hcd *hcd, rhdev->speed = USB_SPEED_WIRELESS; break; case HCD_USB3: + case HCD_USB31: rhdev->speed = USB_SPEED_SUPER; break; default: diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h index 4d147277b30d..f89c24bd53a4 100644 --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h @@ -250,6 +250,7 @@ struct hc_driver { #define HCD_USB2 0x0020 /* USB 2.0 */ #define HCD_USB25 0x0030 /* Wireless USB 1.0 (USB 2.5)*/ #define HCD_USB3 0x0040 /* USB 3.0 */ +#define HCD_USB31 0x0050 /* USB 3.1 */ #define HCD_MASK 0x0070 #define HCD_BH 0x0100 /* URB complete in BH context */ |