usb: gadget: f_midi: add super speed support

Add super speed descriptors for f_midi.

Signed-off-by: Badhri Jagan Sridharan <Badhri@google.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c
index 71ca86c0d772c3ec9745da50a2280f16e9293bbb..94a2012b78f8290ca1e7265846bf776711a0b1b7 100644 (file)
--- a/drivers/usb/gadget/function/f_midi.c
+++ b/drivers/usb/gadget/function/f_midi.c
@@ -163,6 +163,13 @@ static struct usb_endpoint_descriptor bulk_out_desc = {
        .bmAttributes =         USB_ENDPOINT_XFER_BULK,
 };
 
+static struct usb_ss_ep_comp_descriptor bulk_out_ss_comp_desc = {
+       .bLength                = sizeof(bulk_out_ss_comp_desc),
+       .bDescriptorType        = USB_DT_SS_ENDPOINT_COMP,
+       /* .bMaxBurst           = 0, */
+       /* .bmAttributes        = 0, */
+};
+
 /* B.5.2  Class-specific MS Bulk OUT Endpoint Descriptor */
 static struct usb_ms_endpoint_descriptor_16 ms_out_desc = {
        /* .bLength =           DYNAMIC */
@@ -180,6 +187,13 @@ static struct usb_endpoint_descriptor bulk_in_desc = {
        .bmAttributes =         USB_ENDPOINT_XFER_BULK,
 };
 
+static struct usb_ss_ep_comp_descriptor bulk_in_ss_comp_desc = {
+       .bLength                = sizeof(bulk_in_ss_comp_desc),
+       .bDescriptorType        = USB_DT_SS_ENDPOINT_COMP,
+       /* .bMaxBurst           = 0, */
+       /* .bmAttributes        = 0, */
+};
+
 /* B.6.2  Class-specific MS Bulk IN Endpoint Descriptor */
 static struct usb_ms_endpoint_descriptor_16 ms_in_desc = {
        /* .bLength =           DYNAMIC */
@@ -853,7 +867,7 @@ static int f_midi_bind(struct usb_configuration *c, struct usb_function *f)
        struct usb_composite_dev *cdev = c->cdev;
        struct f_midi *midi = func_to_midi(f);
        struct usb_string *us;
-       int status, n, jack = 1, i = 0;
+       int status, n, jack = 1, i = 0, endpoint_descriptor_index = 0;
 
        midi->gadget = cdev->gadget;
        tasklet_init(&midi->tasklet, f_midi_in_tasklet, (unsigned long) midi);
@@ -895,7 +909,7 @@ static int f_midi_bind(struct usb_configuration *c, struct usb_function *f)
                goto fail;
 
        /* allocate temporary function list */
-       midi_function = kcalloc((MAX_PORTS * 4) + 9, sizeof(*midi_function),
+       midi_function = kcalloc((MAX_PORTS * 4) + 11, sizeof(*midi_function),
                                GFP_KERNEL);
        if (!midi_function) {
                status = -ENOMEM;
@@ -985,6 +999,7 @@ static int f_midi_bind(struct usb_configuration *c, struct usb_function *f)
        ms_in_desc.bNumEmbMIDIJack = midi->out_ports;
 
        /* ... and add them to the list */
+       endpoint_descriptor_index = i;
        midi_function[i++] = (struct usb_descriptor_header *) &bulk_out_desc;
        midi_function[i++] = (struct usb_descriptor_header *) &ms_out_desc;
        midi_function[i++] = (struct usb_descriptor_header *) &bulk_in_desc;
@@ -1009,13 +1024,34 @@ static int f_midi_bind(struct usb_configuration *c, struct usb_function *f)
                        goto fail_f_midi;
        }
 
+       if (gadget_is_superspeed(c->cdev->gadget)) {
+               bulk_in_desc.wMaxPacketSize = cpu_to_le16(1024);
+               bulk_out_desc.wMaxPacketSize = cpu_to_le16(1024);
+               i = endpoint_descriptor_index;
+               midi_function[i++] = (struct usb_descriptor_header *)
+                                    &bulk_out_desc;
+               midi_function[i++] = (struct usb_descriptor_header *)
+                                    &bulk_out_ss_comp_desc;
+               midi_function[i++] = (struct usb_descriptor_header *)
+                                    &ms_out_desc;
+               midi_function[i++] = (struct usb_descriptor_header *)
+                                    &bulk_in_desc;
+               midi_function[i++] = (struct usb_descriptor_header *)
+                                    &bulk_in_ss_comp_desc;
+               midi_function[i++] = (struct usb_descriptor_header *)
+                                    &ms_in_desc;
+               f->ss_descriptors = usb_copy_descriptors(midi_function);
+               if (!f->ss_descriptors)
+                       goto fail_f_midi;
+       }
+
        kfree(midi_function);
 
        return 0;
 
 fail_f_midi:
        kfree(midi_function);
-       usb_free_descriptors(f->hs_descriptors);
+       usb_free_all_descriptors(f);
 fail:
        f_midi_unregister_card(midi);
 fail_register: