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

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index c5abe270970a..5ef87794fd32 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -573,7 +573,7 @@ static void device_qual(struct usb_composite_dev *cdev)
         qual->bDeviceSubClass = cdev->desc.bDeviceSubClass;
         qual->bDeviceProtocol = cdev->desc.bDeviceProtocol;
         /* ASSUME same EP0 fifo size at both speeds */
-        qual->bMaxPacketSize0 = cdev->desc.bMaxPacketSize0;
+        qual->bMaxPacketSize0 = cdev->gadget->ep0->maxpacket;
         qual->bNumConfigurations = count_configs(cdev, USB_DT_DEVICE_QUALIFIER);
         qual->bRESERVED = 0;
 }
@@ -1450,7 +1450,6 @@ static int composite_bind(struct usb_gadget *gadget)
                 goto fail;
 
         cdev->desc = *composite->dev;
-        cdev->desc.bMaxPacketSize0 = gadget->ep0->maxpacket;
 
         /* standardized runtime overrides for device ID data */
         if (idVendor)