usb: gadget: zero: add superspeed support

This patch adds SuperSpeed descriptors to the
g_zero gadget.

The SuperSpeed descriptors were added both for
f_soursesink and f_loopback function drivers.

Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>
Signed-off-by: Amit Blay <ablay@codeaurora.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>

3 files changed, 109 insertions, 3 deletions

diff --git a/drivers/usb/gadget/f_loopback.c b/drivers/usb/gadget/f_loopback.c
index 375632659a03..ca660d40b11a 100644
--- a/drivers/usb/gadget/f_loopback.c
+++ b/drivers/usb/gadget/f_loopback.c
@@ -118,6 +118,49 @@ static struct usb_descriptor_header *hs_loopback_descs[] = {
         NULL,
 };
 
+/* super speed support: */
+
+static struct usb_endpoint_descriptor ss_loop_source_desc = {
+        .bLength =              USB_DT_ENDPOINT_SIZE,
+        .bDescriptorType =      USB_DT_ENDPOINT,
+
+        .bmAttributes =         USB_ENDPOINT_XFER_BULK,
+        .wMaxPacketSize =       cpu_to_le16(1024),
+};
+
+struct usb_ss_ep_comp_descriptor ss_loop_source_comp_desc = {
+        .bLength =              USB_DT_SS_EP_COMP_SIZE,
+        .bDescriptorType =      USB_DT_SS_ENDPOINT_COMP,
+        .bMaxBurst =            0,
+        .bmAttributes =         0,
+        .wBytesPerInterval =    0,
+};
+
+static struct usb_endpoint_descriptor ss_loop_sink_desc = {
+        .bLength =              USB_DT_ENDPOINT_SIZE,
+        .bDescriptorType =      USB_DT_ENDPOINT,
+
+        .bmAttributes =         USB_ENDPOINT_XFER_BULK,
+        .wMaxPacketSize =       cpu_to_le16(1024),
+};
+
+struct usb_ss_ep_comp_descriptor ss_loop_sink_comp_desc = {
+        .bLength =              USB_DT_SS_EP_COMP_SIZE,
+        .bDescriptorType =      USB_DT_SS_ENDPOINT_COMP,
+        .bMaxBurst =            0,
+        .bmAttributes =         0,
+        .wBytesPerInterval =    0,
+};
+
+static struct usb_descriptor_header *ss_loopback_descs[] = {
+        (struct usb_descriptor_header *) &loopback_intf,
+        (struct usb_descriptor_header *) &ss_loop_source_desc,
+        (struct usb_descriptor_header *) &ss_loop_source_comp_desc,
+        (struct usb_descriptor_header *) &ss_loop_sink_desc,
+        (struct usb_descriptor_header *) &ss_loop_sink_comp_desc,
+        NULL,
+};
+
 /* function-specific strings: */
 
 static struct usb_string strings_loopback[] = {
@@ -175,8 +218,18 @@ autoconf_fail:
                 f->hs_descriptors = hs_loopback_descs;
         }
 
+        /* support super speed hardware */
+        if (gadget_is_superspeed(c->cdev->gadget)) {
+                ss_loop_source_desc.bEndpointAddress =
+                                fs_loop_source_desc.bEndpointAddress;
+                ss_loop_sink_desc.bEndpointAddress =
+                                fs_loop_sink_desc.bEndpointAddress;
+                f->ss_descriptors = ss_loopback_descs;
+        }
+
         DBG(cdev, "%s speed %s: IN/%s, OUT/%s\n",
-                        gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full",
+            (gadget_is_superspeed(c->cdev->gadget) ? "super" :
+             (gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full")),
                         f->name, loop->in_ep->name, loop->out_ep->name);
         return 0;
 }
diff --git a/drivers/usb/gadget/f_sourcesink.c b/drivers/usb/gadget/f_sourcesink.c
index 5a92883f4c8c..e18b4f520951 100644
--- a/drivers/usb/gadget/f_sourcesink.c
+++ b/drivers/usb/gadget/f_sourcesink.c
@@ -131,6 +131,49 @@ static struct usb_descriptor_header *hs_source_sink_descs[] = {
         NULL,
 };
 
+/* super speed support: */
+
+static struct usb_endpoint_descriptor ss_source_desc = {
+        .bLength =              USB_DT_ENDPOINT_SIZE,
+        .bDescriptorType =      USB_DT_ENDPOINT,
+
+        .bmAttributes =         USB_ENDPOINT_XFER_BULK,
+        .wMaxPacketSize =       cpu_to_le16(1024),
+};
+
+struct usb_ss_ep_comp_descriptor ss_source_comp_desc = {
+        .bLength =              USB_DT_SS_EP_COMP_SIZE,
+        .bDescriptorType =      USB_DT_SS_ENDPOINT_COMP,
+        .bMaxBurst =            0,
+        .bmAttributes =         0,
+        .wBytesPerInterval =    0,
+};
+
+static struct usb_endpoint_descriptor ss_sink_desc = {
+        .bLength =              USB_DT_ENDPOINT_SIZE,
+        .bDescriptorType =      USB_DT_ENDPOINT,
+
+        .bmAttributes =         USB_ENDPOINT_XFER_BULK,
+        .wMaxPacketSize =       cpu_to_le16(1024),
+};
+
+struct usb_ss_ep_comp_descriptor ss_sink_comp_desc = {
+        .bLength =              USB_DT_SS_EP_COMP_SIZE,
+        .bDescriptorType =      USB_DT_SS_ENDPOINT_COMP,
+        .bMaxBurst =            0,
+        .bmAttributes =         0,
+        .wBytesPerInterval =    0,
+};
+
+static struct usb_descriptor_header *ss_source_sink_descs[] = {
+        (struct usb_descriptor_header *) &source_sink_intf,
+        (struct usb_descriptor_header *) &ss_source_desc,
+        (struct usb_descriptor_header *) &ss_source_comp_desc,
+        (struct usb_descriptor_header *) &ss_sink_desc,
+        (struct usb_descriptor_header *) &ss_sink_comp_desc,
+        NULL,
+};
+
 /* function-specific strings: */
 
 static struct usb_string strings_sourcesink[] = {
@@ -187,8 +230,18 @@ autoconf_fail:
                 f->hs_descriptors = hs_source_sink_descs;
         }
 
+        /* support super speed hardware */
+        if (gadget_is_superspeed(c->cdev->gadget)) {
+                ss_source_desc.bEndpointAddress =
+                                fs_source_desc.bEndpointAddress;
+                ss_sink_desc.bEndpointAddress =
+                                fs_sink_desc.bEndpointAddress;
+                f->ss_descriptors = ss_source_sink_descs;
+        }
+
         DBG(cdev, "%s speed %s: IN/%s, OUT/%s\n",
-                        gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full",
+            (gadget_is_superspeed(c->cdev->gadget) ? "super" :
+             (gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full")),
                         f->name, ss->in_ep->name, ss->out_ep->name);
         return 0;
 }
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index af7e7c3818d8..00e2fd2d4791 100644
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -340,7 +340,7 @@ static struct usb_composite_driver zero_driver = {
         .name           = "zero",
         .dev            = &device_desc,
         .strings        = dev_strings,
-        .max_speed      = USB_SPEED_HIGH,
+        .max_speed      = USB_SPEED_SUPER,
         .unbind         = zero_unbind,
         .suspend        = zero_suspend,
         .resume         = zero_resume,