X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/15331876847019b1a3cdec43dcc19073b6b41dd2..f8338897616e0fe6e7213778fd1ef3d064afb77e:/target/linux/adm5120/files/drivers/usb/host/adm5120-q.c diff --git a/target/linux/adm5120/files/drivers/usb/host/adm5120-q.c b/target/linux/adm5120/files/drivers/usb/host/adm5120-q.c index 24542d273..632140b75 100644 --- a/target/linux/adm5120/files/drivers/usb/host/adm5120-q.c +++ b/target/linux/adm5120/files/drivers/usb/host/adm5120-q.c @@ -1,10 +1,16 @@ /* - * OHCI HCD (Host Controller Driver) for USB. + * ADM5120 HCD (Host Controller Driver) for USB * - * (C) Copyright 1999 Roman Weissgaerber - * (C) Copyright 2000-2002 David Brownell + * Copyright (C) 2007,2008 Gabor Juhos + * + * This file was derived from: drivers/usb/host/ohci-q.c + * (C) Copyright 1999 Roman Weissgaerber + * (C) Copyright 2000-2002 David Brownell + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. * - * This file is licenced under the GPL. */ #include @@ -17,31 +23,14 @@ * PRECONDITION: ahcd lock held, irqs blocked. */ static void -finish_urb(struct admhcd *ahcd, struct urb *urb) +finish_urb(struct admhcd *ahcd, struct urb *urb, int status) __releases(ahcd->lock) __acquires(ahcd->lock) { urb_priv_free(ahcd, urb->hcpriv); - urb->hcpriv = NULL; - - spin_lock(&urb->lock); - if (likely(urb->status == -EINPROGRESS)) - urb->status = 0; - /* report short control reads right even though the data TD always - * has TD_R set. (much simpler, but creates the 1-td limit.) - */ - if (unlikely(urb->transfer_flags & URB_SHORT_NOT_OK) - && unlikely(usb_pipecontrol(urb->pipe)) - && urb->actual_length < urb->transfer_buffer_length - && usb_pipein(urb->pipe) - && urb->status == 0) { - urb->status = -EREMOTEIO; -#ifdef ADMHC_VERBOSE_DEBUG - urb_print(urb, "SHORT", usb_pipeout (urb->pipe)); -#endif - } - spin_unlock(&urb->lock); + if (likely(status == -EINPROGRESS)) + status = 0; switch (usb_pipetype(urb->pipe)) { case PIPE_ISOCHRONOUS: @@ -53,12 +42,13 @@ __acquires(ahcd->lock) } #ifdef ADMHC_VERBOSE_DEBUG - urb_print(urb, "RET", usb_pipeout (urb->pipe)); + urb_print(ahcd, urb, "RET", usb_pipeout (urb->pipe), status); #endif /* urb->complete() can reenter this HCD */ + usb_hcd_unlink_urb_from_ep(admhcd_to_hcd(ahcd), urb); spin_unlock(&ahcd->lock); - usb_hcd_giveback_urb(admhcd_to_hcd(ahcd), urb); + usb_hcd_giveback_urb(admhcd_to_hcd(ahcd), urb, status); spin_lock(&ahcd->lock); } @@ -112,7 +102,7 @@ static void periodic_link (struct admhcd *ahcd, struct ed *ed) unsigned i; admhc_vdbg (ahcd, "link %sed %p branch %d [%dus.], interval %d\n", - (ed->hwINFO & cpu_to_hc32 (ahcd, ED_ISO)) ? "iso " : "", + (ed->hwINFO & cpu_to_hc32(ahcd, ED_ISO)) ? "iso " : "", ed, ed->branch, ed->load, ed->interval); for (i = ed->branch; i < NUM_INTS; i += ed->interval) { @@ -202,7 +192,7 @@ static void periodic_unlink (struct admhcd *ahcd, struct ed *ed) admhcd_to_hcd(ahcd)->self.bandwidth_allocated -= ed->load / ed->interval; admhc_vdbg (ahcd, "unlink %sed %p branch %d [%dus.], interval %d\n", - (ed->hwINFO & cpu_to_hc32 (ahcd, ED_ISO)) ? "iso " : "", + (ed->hwINFO & cpu_to_hc32(ahcd, ED_ISO)) ? "iso " : "", ed, ed->branch, ed->load, ed->interval); } #endif @@ -231,6 +221,11 @@ static void periodic_unlink (struct admhcd *ahcd, struct ed *ed) */ static void ed_deschedule(struct admhcd *ahcd, struct ed *ed) { + +#ifdef ADMHC_VERBOSE_DEBUG + admhc_dump_ed(ahcd, "ED-DESCHED", ed, 1); +#endif + ed->hwINFO |= cpu_to_hc32(ahcd, ED_SKIP); wmb(); ed->state = ED_UNLINK; @@ -299,6 +294,7 @@ static struct ed *ed_get(struct admhcd *ahcd, struct usb_host_endpoint *ep, unsigned long flags; spin_lock_irqsave(&ahcd->lock, flags); + ed = ep->hcpriv; if (!ed) { u32 info; @@ -316,6 +312,7 @@ static struct ed *ed_get(struct admhcd *ahcd, struct usb_host_endpoint *ep, if (ed) ep->hcpriv = ed; } + spin_unlock_irqrestore(&ahcd->lock, flags); return ed; @@ -331,7 +328,12 @@ static struct ed *ed_get(struct admhcd *ahcd, struct usb_host_endpoint *ep, */ static void start_ed_unlink(struct admhcd *ahcd, struct ed *ed) { - ed->hwINFO |= cpu_to_hc32 (ahcd, ED_DEQUEUE); + +#ifdef ADMHC_VERBOSE_DEBUG + admhc_dump_ed(ahcd, "ED-UNLINK", ed, 1); +#endif + + ed->hwINFO |= cpu_to_hc32(ahcd, ED_DEQUEUE); ed_deschedule(ahcd, ed); /* add this ED into the remove list */ @@ -430,9 +432,7 @@ static void td_submit_urb(struct admhcd *ahcd, struct urb *urb) int cnt = 0; u32 info = 0; int is_out = usb_pipeout(urb->pipe); - int periodic = 0; u32 toggle = 0; - struct td *td; /* OHCI handles the bulk/interrupt data toggles itself. We just * use the device toggle bits for resetting, and rely on the fact @@ -530,7 +530,10 @@ static void td_submit_urb(struct admhcd *ahcd, struct urb *urb) * we could often reduce the number of TDs here. */ case PIPE_ISOCHRONOUS: - info = TD_SCC_NOTACCESSED; + info = is_out + ? TD_T_CARRY | TD_SCC_NOTACCESSED | TD_DP_OUT + : TD_T_CARRY | TD_SCC_NOTACCESSED | TD_DP_IN; + for (cnt = 0; cnt < urb->number_of_packets; cnt++) { int frame = urb->start_frame; @@ -552,68 +555,64 @@ static void td_submit_urb(struct admhcd *ahcd, struct urb *urb) * Done List handling functions *-------------------------------------------------------------------------*/ -/* calculate transfer length/status and update the urb - * PRECONDITION: irqsafe (only for urb->status locking) - */ -static void td_done(struct admhcd *ahcd, struct urb *urb, struct td *td) +/* calculate transfer length/status and update the urb */ +static int td_done(struct admhcd *ahcd, struct urb *urb, struct td *td) { - u32 info = hc32_to_cpup(ahcd, &td->hwINFO); + struct urb_priv *urb_priv = urb->hcpriv; + u32 info; + u32 bl; + u32 tdDBP; int type = usb_pipetype(urb->pipe); - int cc = TD_CC_NOERROR; + int cc; + int status = -EINPROGRESS; + + info = hc32_to_cpup(ahcd, &td->hwINFO); + tdDBP = hc32_to_cpup(ahcd, &td->hwDBP); + bl = TD_BL_GET(hc32_to_cpup(ahcd, &td->hwCBL)); + cc = TD_CC_GET(info); /* ISO ... drivers see per-TD length/status */ if (type == PIPE_ISOCHRONOUS) { -#if 0 /* TODO */ int dlen = 0; /* NOTE: assumes FC in tdINFO == 0, and that * only the first of 0..MAXPSW psws is used. */ + if (info & TD_CC) /* hc didn't touch? */ + return status; - cc = TD_CC_GET(td); - if (tdINFO & TD_CC) /* hc didn't touch? */ - return; - - if (usb_pipeout (urb->pipe)) - dlen = urb->iso_frame_desc [td->index].length; + if (usb_pipeout(urb->pipe)) + dlen = urb->iso_frame_desc[td->index].length; else { /* short reads are always OK for ISO */ - if (cc == TD_DATAUNDERRUN) + if (cc == TD_CC_DATAUNDERRUN) cc = TD_CC_NOERROR; - dlen = tdPSW & 0x3ff; + dlen = tdDBP - td->data_dma + bl; } + urb->actual_length += dlen; - urb->iso_frame_desc [td->index].actual_length = dlen; - urb->iso_frame_desc [td->index].status = cc_to_error [cc]; + urb->iso_frame_desc[td->index].actual_length = dlen; + urb->iso_frame_desc[td->index].status = cc_to_error[cc]; if (cc != TD_CC_NOERROR) admhc_vdbg (ahcd, "urb %p iso td %p (%d) len %d cc %d\n", urb, td, 1 + td->index, dlen, cc); -#endif + /* BULK, INT, CONTROL ... drivers see aggregate length/status, * except that "setup" bytes aren't counted and "short" transfers * might not be reported as errors. */ } else { - u32 bl = TD_BL_GET(hc32_to_cpup(ahcd, &td->hwCBL)); - u32 tdDBP = hc32_to_cpup(ahcd, &td->hwDBP); - - cc = TD_CC_GET(info); - /* update packet status if needed (short is normally ok) */ if (cc == TD_CC_DATAUNDERRUN && !(urb->transfer_flags & URB_SHORT_NOT_OK)) cc = TD_CC_NOERROR; - if (cc != TD_CC_NOERROR && cc < TD_CC_HCD0) { - admhc_dump_ed(ahcd, "CC ERROR", td->ed, 1); - spin_lock(&urb->lock); - if (urb->status == -EINPROGRESS) - urb->status = cc_to_error[cc]; - spin_unlock(&urb->lock); - } + if (cc != TD_CC_NOERROR && cc < TD_CC_HCD0) + status = cc_to_error[cc]; + /* count all non-empty packets except control SETUP packet */ if ((type != PIPE_CONTROL || td->index != 0) && tdDBP != 0) { @@ -629,34 +628,36 @@ static void td_done(struct admhcd *ahcd, struct urb *urb, struct td *td) } list_del(&td->td_list); + urb_priv->td_idx++; + return status; } /*-------------------------------------------------------------------------*/ -static inline struct td * +static inline void ed_halted(struct admhcd *ahcd, struct td *td, int cc, struct td *rev) { struct urb *urb = td->urb; + struct urb_priv *urb_priv = urb->hcpriv; struct ed *ed = td->ed; struct list_head *tmp = td->td_list.next; - __hc32 toggle = ed->hwHeadP & cpu_to_hc32 (ahcd, ED_C); + __hc32 toggle = ed->hwHeadP & cpu_to_hc32(ahcd, ED_C); admhc_dump_ed(ahcd, "ed halted", td->ed, 1); /* clear ed halt; this is the td that caused it, but keep it inactive * until its urb->complete() has a chance to clean up. */ - ed->hwINFO |= cpu_to_hc32 (ahcd, ED_SKIP); - wmb (); - ed->hwHeadP &= ~cpu_to_hc32 (ahcd, ED_H); + ed->hwINFO |= cpu_to_hc32(ahcd, ED_SKIP); + wmb(); + ed->hwHeadP &= ~cpu_to_hc32(ahcd, ED_H); - /* put any later tds from this urb onto the donelist, after 'td', - * order won't matter here: no errors, and nothing was transferred. - * also patch the ed so it looks as if those tds completed normally. + /* Get rid of all later tds from this urb. We don't have + * to be careful: no errors and nothing was transferred. + * Also patch the ed so it looks as if those tds completed normally. */ while (tmp != &ed->td_list) { struct td *next; - __hc32 info; next = list_entry(tmp, struct td, td_list); tmp = next->td_list.next; @@ -671,16 +672,8 @@ ed_halted(struct admhcd *ahcd, struct td *td, int cc, struct td *rev) * then we need to leave the control STATUS packet queued * and clear ED_SKIP. */ - info = next->hwINFO; -#if 0 /* FIXME */ - info |= cpu_to_hc32 (ahcd, TD_DONE); - info &= ~cpu_to_hc32 (ahcd, TD_CC); -#endif - next->hwINFO = info; - - next->next_dl_td = rev; - rev = next; - + list_del(&next->td_list); + urb_priv->td_cnt++; ed->hwHeadP = next->hwNextTD | toggle; } @@ -694,7 +687,7 @@ ed_halted(struct admhcd *ahcd, struct td *td, int cc, struct td *rev) break; /* fallthrough */ case TD_CC_STALL: - if (usb_pipecontrol (urb->pipe)) + if (usb_pipecontrol(urb->pipe)) break; /* fallthrough */ default: @@ -706,8 +699,6 @@ ed_halted(struct admhcd *ahcd, struct td *td, int cc, struct td *rev) hc32_to_cpu(ahcd, td->hwINFO), cc, cc_to_error [cc]); } - - return rev; } /*-------------------------------------------------------------------------*/ @@ -733,8 +724,8 @@ skip_ed: last = &ed->ed_rm_next; continue; } - - if (!list_empty (&ed->td_list)) { +#if 0 + if (!list_empty(&ed->td_list)) { struct td *td; u32 head; @@ -747,6 +738,7 @@ skip_ed: if (td->td_dma != head) goto skip_ed; } +#endif } /* reentrancy: if we drop the schedule lock, someone might @@ -768,17 +760,18 @@ skip_ed: rescan_this: completed = 0; prev = &ed->hwHeadP; - list_for_each_safe (entry, tmp, &ed->td_list) { + list_for_each_safe(entry, tmp, &ed->td_list) { struct td *td; struct urb *urb; struct urb_priv *urb_priv; __hc32 savebits; + int status; td = list_entry(entry, struct td, td_list); urb = td->urb; urb_priv = td->urb->hcpriv; - if (urb->status == -EINPROGRESS) { + if (!urb->unlinked) { prev = &td->hwNextTD; continue; } @@ -791,28 +784,29 @@ rescan_this: *prev = td->hwNextTD | savebits; /* HC may have partly processed this TD */ - urb_print(urb, "PARTIAL",1); - td_done(ahcd, urb, td); - urb_priv->td_idx++; +#ifdef ADMHC_VERBOSE_DEBUG + urb_print(ahcd, urb, "PARTIAL", 0); +#endif + status = td_done(ahcd, urb, td); /* if URB is done, clean up */ if (urb_priv->td_idx == urb_priv->td_cnt) { modified = completed = 1; - finish_urb(ahcd, urb); + finish_urb(ahcd, urb, status); } } - if (completed && !list_empty (&ed->td_list)) + if (completed && !list_empty(&ed->td_list)) goto rescan_this; /* ED's now officially unlinked, hc doesn't see */ ed->state = ED_IDLE; ed->hwHeadP &= ~cpu_to_hc32(ahcd, ED_H); ed->hwNextED = 0; - wmb (); - ed->hwINFO &= ~cpu_to_hc32 (ahcd, ED_SKIP | ED_DEQUEUE); + wmb(); + ed->hwINFO &= ~cpu_to_hc32(ahcd, ED_SKIP | ED_DEQUEUE); /* but if there's work queued, reschedule */ - if (!list_empty (&ed->td_list)) { + if (!list_empty(&ed->td_list)) { if (HC_IS_RUNNING(admhcd_to_hcd(ahcd)->state)) ed_schedule(ahcd, ed); } @@ -832,27 +826,86 @@ rescan_this: * scanning the (re-reversed) donelist as this does. */ +static void ed_unhalt(struct admhcd *ahcd, struct ed *ed, struct urb *urb) +{ + struct list_head *entry,*tmp; + __hc32 toggle = ed->hwHeadP & cpu_to_hc32(ahcd, ED_C); + +#ifdef ADMHC_VERBOSE_DEBUG + admhc_dump_ed(ahcd, "UNHALT", ed, 0); +#endif + /* clear ed halt; this is the td that caused it, but keep it inactive + * until its urb->complete() has a chance to clean up. + */ + ed->hwINFO |= cpu_to_hc32(ahcd, ED_SKIP); + wmb(); + ed->hwHeadP &= ~cpu_to_hc32(ahcd, ED_H); + + list_for_each_safe(entry, tmp, &ed->td_list) { + struct td *td = list_entry(entry, struct td, td_list); + __hc32 info; + + if (td->urb != urb) + break; + + info = td->hwINFO; + info &= ~cpu_to_hc32(ahcd, TD_CC | TD_OWN); + td->hwINFO = info; + + ed->hwHeadP = td->hwNextTD | toggle; + wmb(); + } + +} + +static void ed_intr_refill(struct admhcd *ahcd, struct ed *ed) +{ + __hc32 toggle = ed->hwHeadP & cpu_to_hc32(ahcd, ED_C); + + ed->hwHeadP = ed->hwTailP | toggle; +} + + +static inline int is_ed_halted(struct admhcd *ahcd, struct ed *ed) +{ + return ((hc32_to_cpup(ahcd, &ed->hwHeadP) & ED_H) == ED_H); +} + +static inline int is_td_halted(struct admhcd *ahcd, struct ed *ed, + struct td *td) +{ + return ((hc32_to_cpup(ahcd, &ed->hwHeadP) & TD_MASK) == + (hc32_to_cpup(ahcd, &td->hwNextTD) & TD_MASK)); +} + static void ed_update(struct admhcd *ahcd, struct ed *ed) { struct list_head *entry,*tmp; - admhc_dump_ed(ahcd, "ed update", ed, 1); +#ifdef ADMHC_VERBOSE_DEBUG + admhc_dump_ed(ahcd, "UPDATE", ed, 1); +#endif list_for_each_safe(entry, tmp, &ed->td_list) { struct td *td = list_entry(entry, struct td, td_list); struct urb *urb = td->urb; struct urb_priv *urb_priv = urb->hcpriv; + int status; if (hc32_to_cpup(ahcd, &td->hwINFO) & TD_OWN) break; /* update URB's length and status from TD */ - td_done(ahcd, urb, td); - urb_priv->td_idx++; + status = td_done(ahcd, urb, td); + if (is_ed_halted(ahcd, ed) && is_td_halted(ahcd, ed, td)) + ed_unhalt(ahcd, ed, urb); + + if (ed->type == PIPE_INTERRUPT) + ed_intr_refill(ahcd,ed); /* If all this urb's TDs are done, call complete() */ if (urb_priv->td_idx == urb_priv->td_cnt) - finish_urb(ahcd, urb); + finish_urb(ahcd, urb, status); /* clean schedule: unlink EDs that are no longer busy */ if (list_empty(&ed->td_list)) { @@ -860,13 +913,13 @@ static void ed_update(struct admhcd *ahcd, struct ed *ed) start_ed_unlink(ahcd, ed); /* ... reenabling halted EDs only after fault cleanup */ - } else if ((ed->hwINFO & cpu_to_hc32 (ahcd, + } else if ((ed->hwINFO & cpu_to_hc32(ahcd, ED_SKIP | ED_DEQUEUE)) - == cpu_to_hc32 (ahcd, ED_SKIP)) { + == cpu_to_hc32(ahcd, ED_SKIP)) { td = list_entry(ed->td_list.next, struct td, td_list); #if 0 - if (!(td->hwINFO & cpu_to_hc32 (ahcd, TD_DONE))) { - ed->hwINFO &= ~cpu_to_hc32 (ahcd, ED_SKIP); + if (!(td->hwINFO & cpu_to_hc32(ahcd, TD_DONE))) { + ed->hwINFO &= ~cpu_to_hc32(ahcd, ED_SKIP); /* ... hc may need waking-up */ switch (ed->type) { case PIPE_CONTROL: @@ -888,11 +941,6 @@ static void ed_update(struct admhcd *ahcd, struct ed *ed) } } -static void ed_halt(struct admhcd *ahcd, struct ed *ed) -{ - admhc_dump_ed(ahcd, "ed_halt", ed, 1); -} - /* there are some tds completed; called in_irq(), with HCD locked */ static void admhc_td_complete(struct admhcd *ahcd) { @@ -902,14 +950,6 @@ static void admhc_td_complete(struct admhcd *ahcd) if (ed->state != ED_OPER) continue; - if (hc32_to_cpup(ahcd, &ed->hwINFO) & ED_SKIP) - continue; - - if (hc32_to_cpup(ahcd, &ed->hwHeadP) & ED_H) { - ed_halt(ahcd, ed); - continue; - } - ed_update(ahcd, ed); } }