On Tue, Jan 10, 2023 at 06:33:25PM +0100, Ahmad Fatoum wrote:
Hello Michael, On 10.01.23 16:17, 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. 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.This breaks fastboot for me on the STM32MP157-based LXA TAC: │barebox@Linux Automation Test Automation Controller (TAC):/ usbgadget -A '' │udc0: registering UDC driver [g_multi] │multi_bind: creating Fastboot function │g_multi usbgadget: Multifunction Composite Gadget │g_multi usbgadget: g_multi ready │dwc2 49000000.usb-otg@xxxxxxxxxxx: bound driver g_multi │barebox@Linux Automation Test Automation Controller (TAC):/ dwc2 49000000.usb-otg@xxxxxxxxxxx: new address 7 │g_multi usbgadget: high-speed config #1: Multifunction Composite Gadget │ERROR: dwc2 49000000.usb-otg@xxxxxxxxxxx: dwc2_ep_enable: No suitable fifo found │ERROR: fastboot: failed to enable in ep: Out of memory Could you look into it?
Yes! We found that the fifo handling on stm32mp1 is not right. There is a patch for the kernel in discussion. https://lore.kernel.org/linux-arm-kernel/20230112112013.1086787-1-u.kleine-koenig@xxxxxxxxxxxxxx/ I just send v2 of this patch with a fix for the fifo size handling in the local dts of barebox. https://lore.barebox.org/barebox/20230124200114.3160585-1-m.grzeschik@xxxxxxxxxxxxxx/T/#m4440a84c96b72a77d47047c8958788fe475b7440 Can you test the series? Thanks, Michael
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);-- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
-- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Attachment:
signature.asc
Description: PGP signature
