Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a666e3e6 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Greg Kroah-Hartman
Browse files

usb: musb: gadget: restart request on clearing endpoint halt 



Commit 46034dca (USB: musb_gadget_ep0: stop
abusing musb_gadget_set_halt()) forgot to restart a queued request after
clearing the endpoint halt feature. This results in a couple of USB resets
while enumerating the file-backed storage gadget due to CSW packet not being
sent for the MODE SENSE(10) command.

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: stable@kernel.org
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4c647338

drivers/usb/musb/musb_gadget.c

+1 −1
Original line number Diff line number Diff line
@@ -1084,7 +1084,7 @@ struct free_record { 
/*

 * Context: controller locked, IRQs blocked.

 */

static void musb_ep_restart(struct musb *musb, struct musb_request *req)

void musb_ep_restart(struct musb *musb, struct musb_request *req)

{

	DBG(3, "<== %s request %p len %u on hw_ep%d\n",

		req->tx ? "TX/IN" : "RX/OUT",

drivers/usb/musb/musb_gadget.h

+2 −0
Original line number Diff line number Diff line
@@ -105,4 +105,6 @@ extern void musb_gadget_cleanup(struct musb *); 


extern void musb_g_giveback(struct musb_ep *, struct usb_request *, int);



extern void musb_ep_restart(struct musb *, struct musb_request *);



#endif		/* __MUSB_GADGET_H */

drivers/usb/musb/musb_gadget_ep0.c

+9 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ __acquires(musb->lock) 
					ctrlrequest->wIndex & 0x0f;

				struct musb_ep		*musb_ep;

				struct musb_hw_ep	*ep;

				struct musb_request	*request;

				void __iomem		*regs;

				int			is_in;

				u16			csr;
@@ -302,6 +303,14 @@ __acquires(musb->lock) 
					musb_writew(regs, MUSB_RXCSR, csr);

				}



				/* Maybe start the first request in the queue */

				request = to_musb_request(

						next_request(musb_ep));

				if (!musb_ep->busy && request) {

					DBG(3, "restarting the request\n");

					musb_ep_restart(musb, request);

				}



				/* select ep0 again */

				musb_ep_select(mbase, 0);

				} break;