usb: define HCD_USB32 speed option for hosts that support USB 3.2 dual-lane

Hosts that support USB 3.2 Enhaned SuperSpeed can set their hcd speed
to HCD_USB32 to let usb core and host drivers know that the controller
supports new USB 3.2 dual-lane features.

make sure usb core handle HCD_USB32 hosts correctly, for now similar
to HCD_USB32.

Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 6241d32..5a799f8 100644 (file)
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -567,6 +567,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_USB32:
                        case HCD_USB31:
                                bufp = usb31_rh_dev_descriptor;
                                break;
@@ -591,6 +592,7 @@ static int rh_call_control (struct usb_hcd *hcd, struct urb *urb)
                        break;
                case USB_DT_CONFIG << 8:
                        switch (hcd->speed) {
+                       case HCD_USB32:
                        case HCD_USB31:
                        case HCD_USB3:
                                bufp = ss_rh_config_descriptor;
@@ -2804,6 +2806,7 @@ int usb_add_hcd(struct usb_hcd *hcd,
        case HCD_USB3:
                rhdev->speed = USB_SPEED_SUPER;
                break;
+       case HCD_USB32:
        case HCD_USB31:
                rhdev->speed = USB_SPEED_SUPER_PLUS;
                break;

diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index e33009c..34a6ded 100644 (file)
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -260,6 +260,7 @@ struct hc_driver {
 #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_USB32       0x0060          /* USB 3.2 */
 #define        HCD_MASK        0x0070
 #define        HCD_BH          0x0100          /* URB complete in BH context */