> -----Original Message----- > From: linux-usb-owner@xxxxxxxxxxxxxxx [mailto:linux-usb-owner@xxxxxxxxxxxxxxx] On Behalf Of Sergei > Shtylyov > Sent: Wednesday, January 28, 2009 2:59 AM > To: felipe.balbi@xxxxxxxxx; gregkh@xxxxxxx > Cc: linux-usb@xxxxxxxxxxxxxxx; davinci-linux-open-source@xxxxxxxxxxxxxxxxxxxx; david-b@xxxxxxxxxxx > Subject: [PATCH 2/8] musb_host: fix endpoint allocation > > The driver prevents using the same numbered Rx/Tx endpoints simultaneously for > the periodic transfers -- which would actually be correct unless they share the > same FIFO. Use 'in_qh' and 'out_qh' fields of the 'struct musb_hw_ep' to check > the endpoint's business and get rid of now completely useless 'periodic' array > in the 'struct musb'. While at it, optimize the loop induction variable in the > endpoint lookup code and remove duplicate/unneeded code elsewhere... > > Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx> > > --- > This is hopefully a better replacement for the patch originally posted by Ajay > Kumar Gupta (http://marc.info/?l=linux-usb&m=122337221417651). > The patch is against the recent Linus' kernel... Why didn't you remove periodic[32] field from "struct musb"? struct musb_qh *periodic[32]; /* tree of interrupt+iso */ -Ajay > > drivers/usb/musb/musb_host.c | 27 ++++++++++----------------- > 1 files changed, 10 insertions(+), 17 deletions(-) > > Index: linux-2.6/drivers/usb/musb/musb_host.c > =================================================================== > --- linux-2.6.orig/drivers/usb/musb/musb_host.c > +++ linux-2.6/drivers/usb/musb/musb_host.c > @@ -400,7 +400,6 @@ musb_giveback(struct musb_qh *qh, struct > * de-allocated if it's tracked and allocated; > * and where we'd update the schedule tree... > */ > - musb->periodic[ep->epnum] = NULL; > kfree(qh); > qh = NULL; > break; > @@ -1716,31 +1715,26 @@ static int musb_schedule( > > /* else, periodic transfers get muxed to other endpoints */ > > - /* FIXME this doesn't consider direction, so it can only > - * work for one half of the endpoint hardware, and assumes > - * the previous cases handled all non-shared endpoints... > - */ > - > - /* we know this qh hasn't been scheduled, so all we need to do > + /* > + * We know this qh hasn't been scheduled, so all we need to do > * is choose which hardware endpoint to put it on ... > * > * REVISIT what we really want here is a regular schedule tree > - * like e.g. OHCI uses, but for now musb->periodic is just an > - * array of the _single_ logical endpoint associated with a > - * given physical one (identity mapping logical->physical). > - * > - * that simplistic approach makes TT scheduling a lot simpler; > - * there is none, and thus none of its complexity... > + * like e.g. OHCI uses. > */ > best_diff = 4096; > best_end = -1; > > - for (epnum = 1; epnum < musb->nr_endpoints; epnum++) { > + for (epnum = 1, hw_ep = musb->endpoints + 1; epnum < musb->nr_endpoints; > + epnum++, hw_ep++) { > int diff; > > - if (musb->periodic[epnum]) > + if (is_in || hw_ep->is_shared_fifo) { > + if (hw_ep->in_qh != NULL) > + continue; > + } else if (hw_ep->out_qh != NULL) > continue; > - hw_ep = &musb->endpoints[epnum]; > + > if (hw_ep == musb->bulk_ep) > continue; > > @@ -1769,7 +1763,6 @@ static int musb_schedule( > idle = 1; > qh->mux = 0; > hw_ep = musb->endpoints + best_end; > - musb->periodic[best_end] = qh; > DBG(4, "qh %p periodic slot %d\n", qh, best_end); > success: > if (head) { > > -- > To unsubscribe from this list: send the line "unsubscribe linux-usb" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
