diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-02-09 10:29:28 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-02-09 10:29:28 +0000 |
commit | d63beb8f0c1e496ebc2a9c568d13233acdafa82f (patch) | |
tree | 4f218ef0f6446459af163261d140df7165ab2ba8 /target/linux/adm5120/files/drivers/usb | |
parent | 119fa4474faee3cfd0fe5265335aa3e36841b877 (diff) |
[adm5120] switch to 2.6.24
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10427 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/adm5120/files/drivers/usb')
4 files changed, 59 insertions, 92 deletions
diff --git a/target/linux/adm5120/files/drivers/usb/host/adm5120-dbg.c b/target/linux/adm5120/files/drivers/usb/host/adm5120-dbg.c index 1027e5c8cd..3eec94a381 100644 --- a/target/linux/adm5120/files/drivers/usb/host/adm5120-dbg.c +++ b/target/linux/adm5120/files/drivers/usb/host/adm5120-dbg.c @@ -82,7 +82,7 @@ static inline char *td_togglestring(u32 info) * small: 0) header + data packets 1) just header */ static void __attribute__((unused)) -urb_print(struct admhcd *ahcd, struct urb *urb, char *str, int small) +urb_print(struct admhcd *ahcd, struct urb *urb, char *str, int small, int status) { unsigned int pipe = urb->pipe; @@ -92,7 +92,7 @@ urb_print(struct admhcd *ahcd, struct urb *urb, char *str, int small) } #ifndef ADMHC_VERBOSE_DEBUG - if (urb->status != 0) + if (status != 0) #endif admhc_dbg(ahcd, "URB-%s %p dev=%d ep=%d%s-%s flags=%x len=%d/%d " "stat=%d\n", @@ -105,7 +105,7 @@ urb_print(struct admhcd *ahcd, struct urb *urb, char *str, int small) urb->transfer_flags, urb->actual_length, urb->transfer_buffer_length, - urb->status); + status); #ifdef ADMHC_VERBOSE_DEBUG if (!small) { @@ -125,7 +125,7 @@ urb_print(struct admhcd *ahcd, struct urb *urb, char *str, int small) urb->transfer_buffer_length: urb->actual_length; for (i = 0; i < 16 && i < len; i++) printk(" %02x", ((__u8 *)urb->transfer_buffer)[i]); - printk("%s stat:%d\n", i < len? "...": "", urb->status); + printk("%s stat:%d\n", i < len? "...": "", status); } } #endif /* ADMHC_VERBOSE_DEBUG */ diff --git a/target/linux/adm5120/files/drivers/usb/host/adm5120-hcd.c b/target/linux/adm5120/files/drivers/usb/host/adm5120-hcd.c index 2d2604aa78..78b1aef134 100644 --- a/target/linux/adm5120/files/drivers/usb/host/adm5120-hcd.c +++ b/target/linux/adm5120/files/drivers/usb/host/adm5120-hcd.c @@ -45,7 +45,7 @@ #include "../core/hcd.h" #include "../core/hub.h" -#define DRIVER_VERSION "0.16.3" +#define DRIVER_VERSION "0.24.0" #define DRIVER_AUTHOR "Gabor Juhos <juhosg at openwrt.org>" #define DRIVER_DESC "ADMtek USB 1.1 Host Controller Driver" @@ -83,8 +83,8 @@ static void admhc_stop(struct usb_hcd *hcd); /* * queue up an urb for anything except the root hub */ -static int admhc_urb_enqueue(struct usb_hcd *hcd, struct usb_host_endpoint *ep, - struct urb *urb, gfp_t mem_flags) +static int admhc_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, + gfp_t mem_flags) { struct admhcd *ahcd = hcd_to_admhcd(hcd); struct ed *ed; @@ -96,12 +96,12 @@ static int admhc_urb_enqueue(struct usb_hcd *hcd, struct usb_host_endpoint *ep, #ifdef ADMHC_VERBOSE_DEBUG spin_lock_irqsave(&ahcd->lock, flags); - urb_print(ahcd, urb, "ENQEUE", usb_pipein(pipe)); + urb_print(ahcd, urb, "ENQEUE", usb_pipein(pipe), -EINPROGRESS); spin_unlock_irqrestore(&ahcd->lock, flags); #endif /* every endpoint has an ed, locate and maybe (re)initialize it */ - ed = ed_get(ahcd, ep, urb->dev, pipe, urb->interval); + ed = ed_get(ahcd, urb->ep, urb->dev, pipe, urb->interval); if (!ed) return -ENOMEM; @@ -161,22 +161,17 @@ static int admhc_urb_enqueue(struct usb_hcd *hcd, struct usb_host_endpoint *ep, goto fail; } - /* in case of unlink-during-submit */ - spin_lock(&urb->lock); - if (urb->status != -EINPROGRESS) { - spin_unlock(&urb->lock); - urb->hcpriv = urb_priv; - finish_urb(ahcd, urb); - ret = 0; + ret = usb_hcd_link_urb_to_ep(hcd, urb); + if (ret) goto fail; - } /* schedule the ed if needed */ if (ed->state == ED_IDLE) { ret = ed_schedule(ahcd, ed); - if (ret < 0) - goto fail0; - + if (ret < 0) { + usb_hcd_unlink_urb_from_ep(hcd, urb); + goto fail; + } if (ed->type == PIPE_ISOCHRONOUS) { u16 frame = admhc_frame_no(ahcd); @@ -204,8 +199,6 @@ static int admhc_urb_enqueue(struct usb_hcd *hcd, struct usb_host_endpoint *ep, admhc_dump_ed(ahcd, "admhc_urb_enqueue", urb_priv->ed, 1); #endif -fail0: - spin_unlock(&urb->lock); fail: if (ret) urb_priv_free(ahcd, urb_priv); @@ -215,23 +208,28 @@ fail: } /* - * decouple the URB from the HC queues (TDs, urb_priv); it's - * already marked using urb->status. reporting is always done + * decouple the URB from the HC queues (TDs, urb_priv); + * reporting is always done * asynchronously, and we might be dealing with an urb that's * partially transferred, or an ED with other urbs being unlinked. */ -static int admhc_urb_dequeue(struct usb_hcd *hcd, struct urb *urb) +static int admhc_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, + int status) { struct admhcd *ahcd = hcd_to_admhcd(hcd); unsigned long flags; + int ret; spin_lock_irqsave(&ahcd->lock, flags); #ifdef ADMHC_VERBOSE_DEBUG - urb_print(ahcd, urb, "DEQUEUE", 1); + urb_print(ahcd, urb, "DEQUEUE", 1, status); #endif - - if (HC_IS_RUNNING(hcd->state)) { + ret = usb_hcd_check_unlink_urb(hcd, urb, status); + if (ret) { + /* Do nothing */ + ; + } else if (HC_IS_RUNNING(hcd->state)) { struct urb_priv *urb_priv; /* Unless an IRQ completed the unlink while it was being @@ -249,11 +247,11 @@ static int admhc_urb_dequeue(struct usb_hcd *hcd, struct urb *urb) * any more ... just clean up every urb's memory. */ if (urb->hcpriv) - finish_urb(ahcd, urb); + finish_urb(ahcd, urb, status); } spin_unlock_irqrestore(&ahcd->lock, flags); - return 0; + return ret; } /*-------------------------------------------------------------------------*/ diff --git a/target/linux/adm5120/files/drivers/usb/host/adm5120-pm.c b/target/linux/adm5120/files/drivers/usb/host/adm5120-pm.c index ac7bf6cfcc..c88e44829f 100644 --- a/target/linux/adm5120/files/drivers/usb/host/adm5120-pm.c +++ b/target/linux/adm5120/files/drivers/usb/host/adm5120-pm.c @@ -383,9 +383,8 @@ static int admhc_restart(struct admhcd *ahcd) ed, ed->state); } - spin_lock(&urb->lock); - urb->status = -ESHUTDOWN; - spin_unlock(&urb->lock); + if (!urb->unlinked) + urb->unlinked = -ESHUTDOWN; } finish_unlinks(ahcd, 0); spin_unlock_irq(&ahcd->lock); 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 52bd1e4e82..632140b75e 100644 --- a/target/linux/adm5120/files/drivers/usb/host/adm5120-q.c +++ b/target/linux/adm5120/files/drivers/usb/host/adm5120-q.c @@ -23,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(ahcd, 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: @@ -59,12 +42,13 @@ __acquires(ahcd->lock) } #ifdef ADMHC_VERBOSE_DEBUG - urb_print(ahcd, 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); } @@ -571,9 +555,7 @@ 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) - */ +/* calculate transfer length/status and update the urb */ static int td_done(struct admhcd *ahcd, struct urb *urb, struct td *td) { struct urb_priv *urb_priv = urb->hcpriv; @@ -582,6 +564,7 @@ static int td_done(struct admhcd *ahcd, struct urb *urb, struct td *td) u32 tdDBP; int type = usb_pipetype(urb->pipe); int cc; + int status = -EINPROGRESS; info = hc32_to_cpup(ahcd, &td->hwINFO); tdDBP = hc32_to_cpup(ahcd, &td->hwDBP); @@ -596,10 +579,9 @@ static int td_done(struct admhcd *ahcd, struct urb *urb, struct td *td) /* NOTE: assumes FC in tdINFO == 0, and that * only the first of 0..MAXPSW psws is used. */ -#if 0 - if (tdINFO & TD_CC) /* hc didn't touch? */ - return; -#endif + if (info & TD_CC) /* hc didn't touch? */ + return status; + if (usb_pipeout(urb->pipe)) dlen = urb->iso_frame_desc[td->index].length; else { @@ -628,12 +610,9 @@ static int td_done(struct admhcd *ahcd, struct urb *urb, struct td *td) && !(urb->transfer_flags & URB_SHORT_NOT_OK)) cc = TD_CC_NOERROR; - if (cc != TD_CC_NOERROR && cc < TD_CC_HCD0) { - 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) { @@ -651,15 +630,16 @@ static int td_done(struct admhcd *ahcd, struct urb *urb, struct td *td) list_del(&td->td_list); urb_priv->td_idx++; - return cc; + 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); @@ -672,13 +652,12 @@ ed_halted(struct admhcd *ahcd, struct td *td, int cc, struct td *rev) 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; @@ -693,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); -#endif - info &= ~cpu_to_hc32(ahcd, TD_CC); - next->hwINFO = info; - - next->next_dl_td = rev; - rev = next; - + list_del(&next->td_list); + urb_priv->td_cnt++; ed->hwHeadP = next->hwNextTD | toggle; } @@ -728,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; } /*-------------------------------------------------------------------------*/ @@ -796,12 +765,13 @@ rescan_this: 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; } @@ -817,12 +787,12 @@ rescan_this: #ifdef ADMHC_VERBOSE_DEBUG urb_print(ahcd, urb, "PARTIAL", 0); #endif - td_done(ahcd, urb, td); + 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)) @@ -920,13 +890,13 @@ static void ed_update(struct admhcd *ahcd, struct ed *ed) struct td *td = list_entry(entry, struct td, td_list); struct urb *urb = td->urb; struct urb_priv *urb_priv = urb->hcpriv; - int cc; + int status; if (hc32_to_cpup(ahcd, &td->hwINFO) & TD_OWN) break; /* update URB's length and status from TD */ - cc = td_done(ahcd, urb, td); + status = td_done(ahcd, urb, td); if (is_ed_halted(ahcd, ed) && is_td_halted(ahcd, ed, td)) ed_unhalt(ahcd, ed, urb); @@ -935,7 +905,7 @@ static void ed_update(struct admhcd *ahcd, struct ed *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)) { |