]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
usb: fastboot: add super speed support
authorLi Jun <jun.li@nxp.com>
Mon, 25 Jan 2021 13:43:55 +0000 (21:43 +0800)
committerMarek Vasut <marex@denx.de>
Sun, 31 Jan 2021 13:08:56 +0000 (14:08 +0100)
Add super speed EP config.

Reviewed-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peter Chen <peter.chen@nxp.com>
Tested-by: faqiang.zhu <faqiang.zhu@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
drivers/usb/gadget/f_fastboot.c

index f5ac22349817d8ee548bc521ddf64f76d17e3e45..f3ce47a0d2a4c2166f8d72bf36e714b6c21c4012 100644 (file)
@@ -128,10 +128,45 @@ static struct usb_descriptor_header *fb_hs_function[] = {
        NULL,
 };
 
+/* Super speed */
+static struct usb_endpoint_descriptor ss_ep_in = {
+       .bLength                = USB_DT_ENDPOINT_SIZE,
+       .bDescriptorType        = USB_DT_ENDPOINT,
+       .bEndpointAddress       = USB_DIR_IN,
+       .bmAttributes           = USB_ENDPOINT_XFER_BULK,
+       .wMaxPacketSize         = cpu_to_le16(1024),
+};
+
+static struct usb_endpoint_descriptor ss_ep_out = {
+       .bLength                = USB_DT_ENDPOINT_SIZE,
+       .bDescriptorType        = USB_DT_ENDPOINT,
+       .bEndpointAddress       = USB_DIR_OUT,
+       .bmAttributes           = USB_ENDPOINT_XFER_BULK,
+       .wMaxPacketSize         = cpu_to_le16(1024),
+};
+
+static struct usb_ss_ep_comp_descriptor fb_ss_bulk_comp_desc = {
+       .bLength =              sizeof(fb_ss_bulk_comp_desc),
+       .bDescriptorType =      USB_DT_SS_ENDPOINT_COMP,
+};
+
+static struct usb_descriptor_header *fb_ss_function[] = {
+       (struct usb_descriptor_header *)&interface_desc,
+       (struct usb_descriptor_header *)&ss_ep_in,
+       (struct usb_descriptor_header *)&fb_ss_bulk_comp_desc,
+       (struct usb_descriptor_header *)&ss_ep_out,
+       (struct usb_descriptor_header *)&fb_ss_bulk_comp_desc,
+       NULL,
+};
+
 static struct usb_endpoint_descriptor *
 fb_ep_desc(struct usb_gadget *g, struct usb_endpoint_descriptor *fs,
-           struct usb_endpoint_descriptor *hs)
+           struct usb_endpoint_descriptor *hs,
+           struct usb_endpoint_descriptor *ss)
 {
+       if (gadget_is_superspeed(g) && g->speed >= USB_SPEED_SUPER)
+               return ss;
+
        if (gadget_is_dualspeed(g) && g->speed == USB_SPEED_HIGH)
                return hs;
        return fs;
@@ -219,6 +254,12 @@ static int fastboot_bind(struct usb_configuration *c, struct usb_function *f)
                f->hs_descriptors = fb_hs_function;
        }
 
+       if (gadget_is_superspeed(gadget)) {
+               ss_ep_in.bEndpointAddress = fs_ep_in.bEndpointAddress;
+               ss_ep_out.bEndpointAddress = fs_ep_out.bEndpointAddress;
+               f->ss_descriptors = fb_ss_function;
+       }
+
        s = env_get("serial#");
        if (s)
                g_dnl_set_serialnumber((char *)s);
@@ -283,7 +324,7 @@ static int fastboot_set_alt(struct usb_function *f,
        debug("%s: func: %s intf: %d alt: %d\n",
              __func__, f->name, interface, alt);
 
-       d = fb_ep_desc(gadget, &fs_ep_out, &hs_ep_out);
+       d = fb_ep_desc(gadget, &fs_ep_out, &hs_ep_out, &ss_ep_out);
        ret = usb_ep_enable(f_fb->out_ep, d);
        if (ret) {
                puts("failed to enable out ep\n");
@@ -298,7 +339,7 @@ static int fastboot_set_alt(struct usb_function *f,
        }
        f_fb->out_req->complete = rx_handler_command;
 
-       d = fb_ep_desc(gadget, &fs_ep_in, &hs_ep_in);
+       d = fb_ep_desc(gadget, &fs_ep_in, &hs_ep_in, &ss_ep_in);
        ret = usb_ep_enable(f_fb->in_ep, d);
        if (ret) {
                puts("failed to enable in ep\n");