@@ -145,6 +145,7 @@ __acquires(ep->musb->lock)
trace_musb_req_gb(req);
usb_gadget_giveback_request(&req->ep->end_point, &req->request);
+ usb_gadget_control_complete(&musb->g, request->explicit_status);
spin_lock(&musb->lock);
ep->busy = busy;
}
@@ -458,6 +458,25 @@ __acquires(musb->lock)
return handled;
}
+static int ep0_send_response(struct musb *musb, bool ack)
+{
+ void __iomem *regs = musb->control_ep->regs;
+ u16 ackpend;
+
+ if (musb->ep0_state != MUSB_EP0_STAGE_RX &&
+ musb->ep0_state != MUSB_EP0_STAGE_STATUSIN)
+ return -EINVAL;
+
+ ackpend = MUSB_CSR0_P_DATAEND
+ | MUSB_CSR0_P_SVDRXPKTRDY
+ | (ack ? 0 : MUSB_CSR0_P_SENDSTALL);
+
+ musb_ep_select(musb->mregs, 0);
+ musb_writew(regs, MUSB_CSR0, ackpend);
+
+ return 0;
+}
+
/* we have an ep0out data packet
* Context: caller holds controller lock
*/
@@ -504,10 +523,13 @@ static void ep0_rxstate(struct musb *musb)
if (req) {
musb->ackpend = csr;
musb_g_ep0_giveback(musb, req);
+ if (req->explicit_status)
+ return;
if (!musb->ackpend)
return;
musb->ackpend = 0;
}
+
musb_ep_select(musb->mregs, 0);
musb_writew(regs, MUSB_CSR0, csr);
}
@@ -939,6 +961,12 @@ musb_g_ep0_queue(struct usb_ep *e, struct usb_request *r, gfp_t gfp_flags)
case MUSB_EP0_STAGE_ACKWAIT: /* zero-length data */
status = 0;
break;
+ case MUSB_EP0_STAGE_STATUSIN:
+ if (r->explicit_status)
+ status = ep0_send_response(musb, r->zero);
+ else
+ status = ep0_send_response(musb, 1);
+ goto cleanup;
default:
musb_dbg(musb, "ep0 request queued in state %d",
musb->ep0_state);
Implement the mechanism for optional explicit status stage for the MUSB driver. This allows a function driver to specify what to reply for the status stage. The functionality for an implicit status stage is retained. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> v1 Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> v1 Acked-by: Bin Liu <b-liu@ti.com> --- Changes from v1: - obvious change to implement v2 mechanism laid out by 4/6 of this series (send_response, and musb_g_ep0_send_response function has been removed, call to usb_gadget_control_complete has been added) - ep0_send_response's ack argument has been changed from stall - last_packet flag in ep0_rxstate has been removed, since it is equal to req != NULL drivers/usb/musb/musb_gadget.c | 1 + drivers/usb/musb/musb_gadget_ep0.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+)