| From a666e3e6098a9f56310e4ec2705f1dad124a34b5 Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sshtylyov@ru.mvista.com> |
| Date: Sat, 11 Sep 2010 13:23:12 -0500 |
| Subject: usb: musb: gadget: restart request on clearing endpoint halt |
| |
| From: Sergei Shtylyov <sshtylyov@ru.mvista.com> |
| |
| commit a666e3e6098a9f56310e4ec2705f1dad124a34b5 upstream. |
| |
| Commit 46034dca515bc4ddca0399ae58106d1f5f0d809f (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: Sergei Shtylyov <sshtylyov@ru.mvista.com> |
| Signed-off-by: Felipe Balbi <balbi@ti.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/usb/musb/musb_gadget.c | 2 +- |
| drivers/usb/musb/musb_gadget.h | 2 ++ |
| drivers/usb/musb/musb_gadget_ep0.c | 9 +++++++++ |
| 3 files changed, 12 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/usb/musb/musb_gadget.c |
| +++ b/drivers/usb/musb/musb_gadget.c |
| @@ -1095,7 +1095,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", |
| --- a/drivers/usb/musb/musb_gadget.h |
| +++ b/drivers/usb/musb/musb_gadget.h |
| @@ -105,4 +105,6 @@ extern void musb_gadget_cleanup(struct m |
| |
| 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 */ |
| --- a/drivers/usb/musb/musb_gadget_ep0.c |
| +++ b/drivers/usb/musb/musb_gadget_ep0.c |
| @@ -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; |