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, 2 insertions, 3 deletions

diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index a9a455692397..1b240990448f 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1347,7 +1347,7 @@ static void make_qualifier (struct dev_data *dev)
         qual.bDeviceProtocol = desc->bDeviceProtocol;
 
         /* assumes ep0 uses the same value for both speeds ... */
-        qual.bMaxPacketSize0 = desc->bMaxPacketSize0;
+        qual.bMaxPacketSize0 = dev->gadget->ep0->maxpacket;
 
         qual.bNumConfigurations = 1;
         qual.bRESERVED = 0;
@@ -1404,7 +1404,6 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
                 }
 
                 dev->state = STATE_DEV_CONNECTED;
-                dev->dev->bMaxPacketSize0 = gadget->ep0->maxpacket;
 
                 INFO (dev, "connected\n");
                 event = next_event (dev, GADGETFS_CONNECT);
@@ -1432,6 +1431,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
 
                 case USB_DT_DEVICE:
                         value = min (w_length, (u16) sizeof *dev->dev);
+                        dev->dev->bMaxPacketSize0 = dev->gadget->ep0->maxpacket;
                         req->buf = dev->dev;
                         break;
 #ifdef  CONFIG_USB_GADGET_DUALSPEED
@@ -1712,7 +1712,6 @@ gadgetfs_bind (struct usb_gadget *gadget)
         set_gadget_data (gadget, dev);
         dev->gadget = gadget;
         gadget->ep0->driver_data = dev;
-        dev->dev->bMaxPacketSize0 = gadget->ep0->maxpacket;
 
         /* preallocate control response and buffer */
         dev->req = usb_ep_alloc_request (gadget->ep0, GFP_KERNEL);