On Tue, Jan 10, 2023 at 04:17:38PM +0100, Michael Grzeschik wrote: > If the multiplier is 0 in the descriptor bitfield the multiplier count > is one. For calculating the multiplier count the extra function > usb_endpoint_maxp_mult should be used. Rework the dwc2 driver to use it > and make multi packages work. Yes, the driver seems to expect mc to be in the range of 1 to 3 included (see dwc2_set_ep_maxpacket in driver/usb/dwc2/gadget.c) This is aslo the range accepted by dwc2 hardware. However the .mc fields isn't used at all, it should be written in the epsize register (see macro DXEPTSIZ_MC) > While at it, we also remove the USB_EP_MAXP_MULT and > USB_ENDPOINT_MAXP_MASK macros that would stay left unused and are > defined in include/usb/ch9.ch anyway. Indeed, this is can be removed. I've tested this patch on one board and it worked just find. Tested-by: Jules Maselbas <jmaselbas@xxxxxxxxx> > Signed-off-by: Michael Grzeschik <m.grzeschik@xxxxxxxxxxxxxx> > --- > drivers/usb/dwc2/gadget.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) > > diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c > index 7070485410..5a72ba795b 100644 > --- a/drivers/usb/dwc2/gadget.c > +++ b/drivers/usb/dwc2/gadget.c > @@ -14,13 +14,6 @@ > #define spin_lock_irqsave(lock, flags) (void)(flags) > #define spin_unlock_irqrestore(lock, flags) (void)(flags) > > -#ifndef USB_ENDPOINT_MAXP_MASK > -#define USB_ENDPOINT_MAXP_MASK 0x07ff > -#endif > -#ifndef USB_EP_MAXP_MULT > -#define USB_EP_MAXP_MULT(m) (((m) & 0x1800) >> 11) > -#endif > - > static void kill_all_requests(struct dwc2 *, struct dwc2_ep *, int); > > static inline struct dwc2_ep *index_to_ep(struct dwc2 *dwc2, > @@ -484,7 +477,7 @@ static int dwc2_ep_enable(struct usb_ep *ep, > > ep_type = desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK; > mps = usb_endpoint_maxp(desc) & USB_ENDPOINT_MAXP_MASK; > - mc = USB_EP_MAXP_MULT(usb_endpoint_maxp(desc)); > + mc = usb_endpoint_maxp_mult(desc); > > /* note, we handle this here instead of dwc2_set_ep_maxpacket */ > epctrl_reg = dir_in ? DIEPCTL(index) : DOEPCTL(index); > -- > 2.30.2 > > > > > >
