lua: Fixed some cross-platform issues for PPC (and probably other architectures)

[openwrt.git] / 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 9995d42..632140b 100644 (file)
--- a/target/linux/adm5120/files/drivers/usb/host/adm5120-q.c
+++ b/target/linux/adm5120/files/drivers/usb/host/adm5120-q.c
@@ -1,13 +1,16 @@
 /*
  * ADM5120 HCD (Host Controller Driver) for USB
  *
 /*
  * ADM5120 HCD (Host Controller Driver) for USB
  *

- * Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
+ * Copyright (C) 2007,2008 Gabor Juhos <juhosg at openwrt.org>

  *
  * This file was derived from: drivers/usb/host/ohci-q.c
  *   (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
  *   (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
  *
  *
  * This file was derived from: drivers/usb/host/ohci-q.c
  *   (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
  *   (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
  *

- * This file is licenced under the GPL.
+ *  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.
+ *

  */
 
 #include <linux/irq.h>
  */
 
 #include <linux/irq.h>


@@ -20,31 +23,14 @@
  * PRECONDITION:  ahcd lock held, irqs blocked.
  */
 static void
  * 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);
 __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:
 
        switch (usb_pipetype(urb->pipe)) {
        case PIPE_ISOCHRONOUS:


@@ -56,12 +42,13 @@ __acquires(ahcd->lock)
        }
 
 #ifdef ADMHC_VERBOSE_DEBUG
        }
 
 #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 */
 #endif
 
        /* urb->complete() can reenter this HCD */

+       usb_hcd_unlink_urb_from_ep(admhcd_to_hcd(ahcd), urb);

        spin_unlock(&ahcd->lock);
        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);
 }
 
        spin_lock(&ahcd->lock);
 }
 


@@ -543,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:
         * 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;
 
                for (cnt = 0; cnt < urb->number_of_packets; cnt++) {
                        int frame = urb->start_frame;
 


@@ -565,68 +555,64 @@ static void td_submit_urb(struct admhcd *ahcd, struct urb *urb)
  * Done List handling functions
  *-------------------------------------------------------------------------*/
 
  * 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;
 static int td_done(struct admhcd *ahcd, struct urb *urb, struct td *td)
 {
        struct urb_priv *urb_priv = urb->hcpriv;

-       u32     info = hc32_to_cpup(ahcd, &td->hwINFO);
+       u32     info;
+       u32     bl;
+       u32     tdDBP;

        int     type = usb_pipetype(urb->pipe);
        int     cc;
        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);
+       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) {
        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.
                 */
                /* 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 */
                else {
                        /* short reads are always OK for ISO */

-                       if (cc == TD_DATAUNDERRUN)
+                       if (cc == TD_CC_DATAUNDERRUN)

                                cc = TD_CC_NOERROR;
                                cc = TD_CC_NOERROR;

-                       dlen = tdPSW & 0x3ff;
+                       dlen = tdDBP - td->data_dma + bl;

                }
                }

+

                urb->actual_length += dlen;
                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);
 
                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 {
        /* 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);
-

                /* 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;
 
                /* 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) {
-                       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) {
 
                /* count all non-empty packets except control SETUP packet */
                if ((type != PIPE_CONTROL || td->index != 0) && tdDBP != 0) {


@@ -644,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++;
 
        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;
 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);
        struct ed               *ed = td->ed;
        struct list_head        *tmp = td->td_list.next;
        __hc32                  toggle = ed->hwHeadP & cpu_to_hc32(ahcd, ED_C);


@@ -665,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);
 
        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;
         */
        while (tmp != &ed->td_list) {
                struct td       *next;

-               __hc32          info;

 
                next = list_entry(tmp, struct td, td_list);
                tmp = next->td_list.next;
 
                next = list_entry(tmp, struct td, td_list);
                tmp = next->td_list.next;


@@ -686,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.
                 */
                 * 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;
        }
 
                ed->hwHeadP = next->hwNextTD | toggle;
        }
 


@@ -721,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]);
        }
                        hc32_to_cpu(ahcd, td->hwINFO),
                        cc, cc_to_error [cc]);
        }

-
-       return rev;

 }
 
 /*-------------------------------------------------------------------------*/
 }
 
 /*-------------------------------------------------------------------------*/


@@ -789,12 +765,13 @@ rescan_this:
                        struct urb      *urb;
                        struct urb_priv *urb_priv;
                        __hc32          savebits;
                        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;
 
 
                        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;
                        }
                                prev = &td->hwNextTD;
                                continue;
                        }


@@ -810,12 +787,12 @@ rescan_this:
 #ifdef ADMHC_VERBOSE_DEBUG
                        urb_print(ahcd, urb, "PARTIAL", 0);
 #endif
 #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;
 
                        /* 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))


@@ -913,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;
                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 */
 
                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);
 
                if (is_ed_halted(ahcd, ed) && is_td_halted(ahcd, ed, td))
                        ed_unhalt(ahcd, ed, urb);
 


@@ -928,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)
 
                /* 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)) {
 
                /* clean schedule:  unlink EDs that are no longer busy */
                if (list_empty(&ed->td_list)) {