Skip to content

Commit

Permalink
usb: renesas_usbhs: tifyup packet start timing
Browse files Browse the repository at this point in the history
packet transfer timing are controlled in mod_gadget on current renesas_usbhs,
and this style will be imitated on mod_host.
But it need not be managed with host/gadget if it is general transfer.
By this patch, the packet transfer timing is managed in fifo.c

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Kuninori Morimoto authored and Greg Kroah-Hartman committed Jun 7, 2011
1 parent d77e3f4 commit 0432eed
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 17 deletions.
6 changes: 5 additions & 1 deletion drivers/usb/renesas_usbhs/fifo.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ void usbhs_pkt_push(struct usbhs_pipe *pipe, struct usbhs_pkt *pkt,

usbhs_unlock(priv, flags);
/******************** spin unlock ******************/

usbhs_pkt_start(pipe);
}

static void __usbhsf_pkt_del(struct usbhs_pkt *pkt)
Expand Down Expand Up @@ -148,8 +150,10 @@ int __usbhs_pkt_handler(struct usbhs_pipe *pipe, int type)
usbhs_unlock(priv, flags);
/******************** spin unlock ******************/

if (is_done)
if (is_done) {
info->done(pkt);
usbhs_pkt_start(pipe);
}

return ret;
}
Expand Down
22 changes: 6 additions & 16 deletions drivers/usb/renesas_usbhs/mod_gadget.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,23 +125,16 @@ static void usbhsg_queue_push(struct usbhsg_uep *uep,
struct usbhs_pkt *pkt = usbhsg_ureq_to_pkt(ureq);
struct usb_request *req = &ureq->req;

usbhs_pkt_push(pipe, pkt, uep->handler,
req->buf, req->length, req->zero);
req->actual = 0;
req->status = -EINPROGRESS;
usbhs_pkt_push(pipe, pkt, uep->handler,
req->buf, req->length, req->zero);

dev_dbg(dev, "pipe %d : queue push (%d)\n",
usbhs_pipe_number(pipe),
req->length);
}

static void usbhsg_queue_start(struct usbhsg_uep *uep)
{
struct usbhs_pipe *pipe = usbhsg_uep_to_pipe(uep);

usbhs_pkt_start(pipe);
}

static void usbhsg_queue_pop(struct usbhsg_uep *uep,
struct usbhsg_request *ureq,
int status)
Expand All @@ -154,10 +147,6 @@ static void usbhsg_queue_pop(struct usbhsg_uep *uep,

ureq->req.status = status;
ureq->req.complete(&uep->ep, &ureq->req);

/* more request ? */
if (0 == status)
usbhsg_queue_start(uep);
}

static void usbhsg_queue_done(struct usbhs_pkt *pkt)
Expand Down Expand Up @@ -222,6 +211,7 @@ static int usbhsg_recip_run_handle(struct usbhs_priv *priv,
struct usbhsg_gpriv *gpriv = usbhsg_priv_to_gpriv(priv);
struct device *dev = usbhsg_gpriv_to_dev(gpriv);
struct usbhsg_uep *uep;
struct usbhs_pipe *pipe;
int recip = ctrl->bRequestType & USB_RECIP_MASK;
int nth = le16_to_cpu(ctrl->wIndex) & USB_ENDPOINT_NUMBER_MASK;
int ret;
Expand All @@ -230,7 +220,8 @@ static int usbhsg_recip_run_handle(struct usbhs_priv *priv,
char *msg;

uep = usbhsg_gpriv_to_nth_uep(gpriv, nth);
if (!usbhsg_uep_to_pipe(uep)) {
pipe = usbhsg_uep_to_pipe(uep);
if (!pipe) {
dev_err(dev, "wrong recip request\n");
ret = -EINVAL;
goto usbhsg_recip_run_handle_end;
Expand Down Expand Up @@ -268,7 +259,7 @@ static int usbhsg_recip_run_handle(struct usbhs_priv *priv,
}

usbhsg_recip_run_handle_end:
usbhsg_queue_start(uep);
usbhs_pkt_start(pipe);

return ret;
}
Expand Down Expand Up @@ -470,7 +461,6 @@ static int usbhsg_ep_queue(struct usb_ep *ep, struct usb_request *req,
return -ESHUTDOWN;

usbhsg_queue_push(uep, ureq);
usbhsg_queue_start(uep);

return 0;
}
Expand Down

0 comments on commit 0432eed

Please sign in to comment.