usb: composite: force gadget to be USB2 for HS only function

If one of functions is not super speed capable, we need force the udc
to be high speed, this is an equivalent implementation of
usb_gadget_udc_set_speed() in kernel but simple, which set the gadget
max_speed to be high speed, so afterwards when start gadget duc can
set the HW to be USB 2.0 mode.

Reviewed-by: Ye Li <[email protected]>
Reviewed-by: Peter Chen <[email protected]>
Tested-by: faqiang.zhu <[email protected]>
Signed-off-by: Li Jun <[email protected]>
Signed-off-by: Peng Fan <[email protected]>

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 1063c571d80131afcf6ca69ddcdea05c095a62b0..2a309e624e10784fc0aa461d06384d0151fcf3ad 100644 (file)
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -532,6 +532,19 @@ int usb_add_config(struct usb_composite_dev *cdev,
                }
        }
 
+       /*
+        * If one function of config is not super speed capable,
+        * force the gadget to be high speed so controller driver
+        * can init HW to be USB 2.0
+        */
+       if (gadget_is_superspeed(cdev->gadget)) {
+               list_for_each_entry(f, &config->functions, list) {
+                       if (!f->ss_descriptors)
+                               cdev->gadget->max_speed =
+                                       USB_SPEED_HIGH;
+               }
+       }
+
        usb_ep_autoconfig_reset(cdev->gadget);
 
        os_desc_config = config;