usb: gadget: defer setting maxpacket till ->setup()

maxpacket is set by the udc driver for ep0 very early. This value is
copied by the function gadget used later for the USB_DT_DEVICE and
USB_DT_DEVICE_QUALIFIER query. This seems to work fine so far. For USB3
we need set a different value here. In SS speed it is 2^x with x=9 and
in HS we set something <= 64. If the UDC starts in SS and continues in
HS after the cable has been plugged it will report a too small value.
There setting of this value is defered and taken automaticly from the
ep0 pointer where the UDC driver can update it according to the speed it
detected _after_ a cable has been plugged.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 9 insertions, 5 deletions

diff --git a/drivers/usb/gadget/printer.c b/drivers/usb/gadget/printer.c
index 00e5f19c75ba..d5df8dd9d58e 100644
--- a/drivers/usb/gadget/printer.c
+++ b/drivers/usb/gadget/printer.c
@@ -1148,6 +1148,8 @@ printer_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
                         switch (wValue >> 8) {
 
                         case USB_DT_DEVICE:
+                                device_desc.bMaxPacketSize0 =
+                                        gadget->ep0->maxpacket;
                                 value = min(wLength, (u16) sizeof device_desc);
                                 memcpy(req->buf, &device_desc, value);
                                 break;
@@ -1155,6 +1157,12 @@ printer_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
                         case USB_DT_DEVICE_QUALIFIER:
                                 if (!gadget->is_dualspeed)
                                         break;
+                                /*
+                                 * assumes ep0 uses the same value for both
+                                 * speeds
+                                 */
+                                dev_qualifier.bMaxPacketSize0 =
+                                        gadget->ep0->maxpacket;
                                 value = min(wLength,
                                                 (u16) sizeof dev_qualifier);
                                 memcpy(req->buf, &dev_qualifier, value);
@@ -1450,15 +1458,11 @@ autoconf_fail:
         out_ep->driver_data = out_ep;   /* claim */
 
 #ifdef  CONFIG_USB_GADGET_DUALSPEED
-        /* assumes ep0 uses the same value for both speeds ... */
-        dev_qualifier.bMaxPacketSize0 = device_desc.bMaxPacketSize0;
-
-        /* and that all endpoints are dual-speed */
+        /* assumes that all endpoints are dual-speed */
         hs_ep_in_desc.bEndpointAddress = fs_ep_in_desc.bEndpointAddress;
         hs_ep_out_desc.bEndpointAddress = fs_ep_out_desc.bEndpointAddress;
 #endif  /* DUALSPEED */
 
-        device_desc.bMaxPacketSize0 = gadget->ep0->maxpacket;
         usb_gadget_set_selfpowered(gadget);
 
         if (gadget->is_otg) {