From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 10 Jan 2023 18:34:44 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pFIWL-0080Gi-Jm for lore@lore.pengutronix.de; Tue, 10 Jan 2023 18:34:44 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pFIWJ-0006gD-MD for lore@pengutronix.de; Tue, 10 Jan 2023 18:34:44 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:In-Reply-To:From:References:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=fmaidl+gEXpPFTFFSvdqoUx/Whr80kcCJNjDOeTpeT8=; b=1EG77BE7Hw0uOr6Etf5BZ8vNCI oqnST1VgTBS6y9SHrr0yKdgEThHxv6arzIQMy1EvYE0Z12ao4ajSHfhB5G/BEHVAeeT70PvJ/KV8f XDl20vZVCd8+LKmi4L07OTf7f/lvAmiJjGMAZbab1GUjyEpfkmTOTD8Xnuwqa1cFiHEjA4ELHumt/ R1LkeDlt3D+H4H1x1fY41Tx7TSQNTc3UXCJyw89wUExKyVHWJuubhcNB/31Ah65svjG+Vn7ehxCLz zhYL+b6f22QxNOsfFaTTvdlDs1C23Tt4Mv1N/7WBZGvaXCg2Sk/JUlgF9/phwWArscNp1SzRHSRUz I0Q7jKYw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFIVA-007zUo-5y; Tue, 10 Jan 2023 17:33:32 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFIV5-007zU7-8b for barebox@lists.infradead.org; Tue, 10 Jan 2023 17:33:28 +0000 Received: from ptz.office.stw.pengutronix.de ([2a0a:edc0:0:900:1d::77] helo=[127.0.0.1]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pFIV3-0006cU-Bj; Tue, 10 Jan 2023 18:33:25 +0100 Message-ID: <9eb5ee2c-ce24-b8b2-9a61-a2e48f56fd5e@pengutronix.de> Date: Tue, 10 Jan 2023 18:33:25 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Content-Language: en-US To: Michael Grzeschik , barebox@lists.infradead.org References: <20230110151738.4019078-1-m.grzeschik@pengutronix.de> From: Ahmad Fatoum In-Reply-To: <20230110151738.4019078-1-m.grzeschik@pengutronix.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230110_093327_326550_5FD83BB7 X-CRM114-Status: GOOD ( 23.02 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.7 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,NICE_REPLY_A,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Subject: Re: [PATCH] usb: dwc2: fix multiplier handling in endpoint setup X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) 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@49000000.of: bound driver g_multi │barebox@Linux Automation Test Automation Controller (TAC):/ dwc2 49000000.usb-otg@49000000.of: new address 7 │g_multi usbgadget: high-speed config #1: Multifunction Composite Gadget │ERROR: dwc2 49000000.usb-otg@49000000.of: dwc2_ep_enable: No suitable fifo found │ERROR: fastboot: failed to enable in ep: Out of memory Could you look into it? Cheers, Ahmad > > Signed-off-by: Michael Grzeschik > --- > 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 |