[adm5120] usb-driver: add preliminary support of ISOCHRONOUS transfer
[openwrt.git] / target / linux / adm5120 / files / drivers / usb / host / adm5120-dbg.c
index 7a0c73c..1027e5c 100644 (file)
@@ -1,10 +1,16 @@
 /*
- * OHCI HCD (Host Controller Driver) for USB.
+ * ADM5120 HCD (Host Controller Driver) for USB
  *
- * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
- * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
+ * Copyright (C) 2007,2008 Gabor Juhos <juhosg at openwrt.org>
+ *
+ * This file was derived from: drivers/usb/host/ohci-dbg.c
+ *   (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
+ *   (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
+ *
+ *  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.
  */
 
 /*-------------------------------------------------------------------------*/
@@ -33,8 +39,6 @@ static inline char *ed_statestring(int state)
                return "UNLINK";
        case ED_OPER:
                return "OPER";
-       case ED_NEW:
-               return "NEW";
        }
        return "?STATE";
 }
@@ -70,13 +74,15 @@ static inline char *td_togglestring(u32 info)
        return "?TOGGLE";
 }
 
+/*-------------------------------------------------------------------------*/
+
 #ifdef DEBUG
 
 /* debug| print the main components of an URB
  * 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)
 {
        unsigned int pipe = urb->pipe;
 
@@ -92,8 +98,8 @@ urb_print(struct admhcd *ahcd, struct urb * urb, char * str, int small)
                        "stat=%d\n",
                        str,
                        urb,
-                       usb_pipedevice(pipe),
-                       usb_pipeendpoint(pipe),
+                       usb_pipedevice (pipe),
+                       usb_pipeendpoint (pipe),
                        usb_pipeout(pipe)? "out" : "in",
                        pipestring(pipe),
                        urb->transfer_flags,
@@ -106,20 +112,20 @@ urb_print(struct admhcd *ahcd, struct urb * urb, char * str, int small)
                int i, len;
 
                if (usb_pipecontrol(pipe)) {
-                       admhc_dbg(admhc, "setup(8): ");
+                       admhc_dbg(ahcd, "setup(8):");
                        for (i = 0; i < 8 ; i++)
                                printk (" %02x", ((__u8 *) urb->setup_packet) [i]);
                        printk ("\n");
                }
                if (urb->transfer_buffer_length > 0 && urb->transfer_buffer) {
-                       admhc_dbg(admhc, "data(%d/%d): ",
+                       admhc_dbg(ahcd, "data(%d/%d):",
                                urb->actual_length,
                                urb->transfer_buffer_length);
                        len = usb_pipeout(pipe)?
                                                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(" %02x", ((__u8 *)urb->transfer_buffer)[i]);
+                       printk("%s stat:%d\n", i < len? "...": "", urb->status);
                }
        }
 #endif /* ADMHC_VERBOSE_DEBUG */
@@ -139,7 +145,7 @@ urb_print(struct admhcd *ahcd, struct urb * urb, char * str, int small)
 static void admhc_dump_intr_mask(struct admhcd *ahcd, char *label, u32 mask,
                char **next, unsigned *size)
 {
-       admhc_dbg_sw(ahcd, next, size, "%s 0x%08x%s%s%s%s%s%s%s%s%s%s\n",
+       admhc_dbg_sw(ahcd, next, size, "%s 0x%08x%s%s%s%s%s%s%s%s%s%s%s%s\n",
                label,
                mask,
                (mask & ADMHC_INTR_INTA) ? " INTA" : "",
@@ -150,6 +156,8 @@ static void admhc_dump_intr_mask(struct admhcd *ahcd, char *label, u32 mask,
                (mask & ADMHC_INTR_SO) ? " SO" : "",
                (mask & ADMHC_INTR_INSM) ? " INSM" : "",
                (mask & ADMHC_INTR_BABI) ? " BABI" : "",
+               (mask & ADMHC_INTR_7) ? " !7!" : "",
+               (mask & ADMHC_INTR_6) ? " !6!" : "",
                (mask & ADMHC_INTR_RESI) ? " RESI" : "",
                (mask & ADMHC_INTR_SOFI) ? " SOFI" : ""
                );
@@ -243,7 +251,7 @@ admhc_dump_roothub(
 {
        u32                     temp, i;
 
-       temp = admhc_get_rhdesc(ahcd);
+       temp = admhc_read_rhdesc(ahcd);
        if (temp == ~(u32)0)
                return;
 
@@ -267,7 +275,7 @@ admhc_dump_roothub(
        }
 
        for (i = 0; i < ahcd->num_ports; i++) {
-               temp = admhc_get_portstatus(ahcd, i);
+               temp = admhc_read_portstatus(ahcd, i);
                dbg_port_sw(ahcd, i, temp, next, size);
        }
 }
@@ -316,18 +324,6 @@ static void admhc_dump_td(const struct admhcd *ahcd, const char *label,
                (tmp & TD_IE) ? " IE" : "");
 }
 
-static void admhc_dump_up(const struct admhcd *ahcd, const char *label,
-               const struct urb_priv *up)
-{
-       int i;
-
-       admhc_dbg(ahcd, "%s urb/%p:\n", label, up->urb);
-       for (i = 0; i < up->td_cnt; i++) {
-               struct td *td = up->td[i];
-               admhc_dump_td(ahcd, "    ->", td);
-       }
-}
-
 /* caller MUST own hcd spinlock if verbose is set! */
 static void __attribute__((unused))
 admhc_dump_ed(const struct admhcd *ahcd, const char *label,
@@ -350,31 +346,31 @@ admhc_dump_ed(const struct admhcd *ahcd, const char *label,
                ED_FA_GET(tmp));
 
        tmp = hc32_to_cpup(ahcd, &ed->hwHeadP);
-       admhc_dbg(ahcd, "  tds: head %08x tail %08x %s%s\n",
+       admhc_dbg(ahcd, "  tds: head %08x tail %08x %s%s%s\n",
                tmp & TD_MASK,
-               hc32_to_cpup(ahcd, &ed->hwTailP),
+               hc32_to_cpup (ahcd, &ed->hwTailP),
                (tmp & ED_C) ? data1 : data0,
-               (tmp & ED_H) ? " HALT" : "");
+               (tmp & ED_H) ? " HALT" : "",
+               verbose ? " td list follows" : " (not listing)");
 
-       if (ed->urb_active)
-               admhc_dump_up(ahcd, "  active ", ed->urb_active);
-
-       if ((verbose) && (!list_empty(&ed->urb_pending))) {
-               struct list_head *entry;
-               /* dump pending URBs */
-               list_for_each(entry, &ed->urb_pending) {
-                       struct urb_priv *up;
-                       up = list_entry(entry, struct urb_priv, pending);
-                       admhc_dump_up(ahcd, "  pending ", up);
+       if (verbose) {
+               struct list_head        *tmp;
+
+               /* use ed->td_list because HC concurrently modifies
+                * hwNextTD as it accumulates ed_donelist.
+                */
+               list_for_each(tmp, &ed->td_list) {
+                       struct td               *td;
+                       td = list_entry(tmp, struct td, td_list);
+                       admhc_dump_td (ahcd, "  ->", td);
                }
        }
 }
 
 #else /* ifdef DEBUG */
 
-static inline void urb_print(struct urb * urb, char * str, int small) {}
-static inline void admhc_dump_up(const struct admhcd *ahcd, const char *label,
-       const struct urb_priv *up) {}
+static inline void urb_print(struct admhcd *ahcd, struct urb * urb, char * str,
+       int small) {}
 static inline void admhc_dump_ed(const struct admhcd *ahcd, const char *label,
        const struct ed *ed, int verbose) {}
 static inline void admhc_dump_td(const struct admhcd *ahcd, const char *label,
@@ -394,44 +390,6 @@ static inline void remove_debug_files(struct admhcd *bus) { }
 
 #else
 
-static ssize_t
-show_urb_priv(struct admhcd *ahcd, char *buf, size_t count,
-               struct urb_priv *up)
-{
-       unsigned temp, size = count;
-       int i;
-
-       if (!up)
-               return 0;
-
-       temp = scnprintf(buf, size,"\n\turb %p ", up->urb);
-       size -= temp;
-       buf += temp;
-
-       for (i = 0; i< up->td_cnt; i++) {
-               struct td *td;
-               u32 dbp, cbl, info;
-
-               td = up->td[i];
-               info = hc32_to_cpup(ahcd, &td->hwINFO);
-               dbp = hc32_to_cpup(ahcd, &td->hwDBP);
-               cbl = hc32_to_cpup(ahcd, &td->hwCBL);
-
-               temp = scnprintf(buf, size,
-                       "\n\t\ttd %p %s %d %s%scc=%x (%08x,%08x)",
-                       td,
-                       td_pidstring(info),
-                       TD_BL_GET(cbl),
-                       (info & TD_OWN) ? "WORK " : "DONE ",
-                       (cbl & TD_IE) ? "IE " : "",
-                       TD_CC_GET(info), info, cbl);
-               size -= temp;
-               buf += temp;
-       }
-
-       return count - size;
-}
-
 static ssize_t
 show_list(struct admhcd *ahcd, char *buf, size_t count, struct ed *ed)
 {
@@ -444,10 +402,15 @@ show_list(struct admhcd *ahcd, char *buf, size_t count, struct ed *ed)
        while (ed) {
                u32 info = hc32_to_cpu(ahcd, ed->hwINFO);
                u32 headp = hc32_to_cpu(ahcd, ed->hwHeadP);
+               u32 tailp = hc32_to_cpu(ahcd, ed->hwTailP);
+               struct list_head *entry;
+               struct td       *td;
 
                temp = scnprintf(buf, size,
-                       "ed/%p %s %cs dev%d ep%d %s%smax %d %08x%s%s %s",
+                       "ed/%p %s %s %cs dev%d ep%d %s%smax %d %08x%s%s %s"
+                       " h:%08x t:%08x",
                        ed,
+                       ed_statestring(ed->state),
                        ed_typestring (ed->type),
                        (info & ED_SPEED_FULL) ? 'f' : 'l',
                        info & ED_FA_MASK,
@@ -458,45 +421,37 @@ show_list(struct admhcd *ahcd, char *buf, size_t count, struct ed *ed)
                        info,
                        (info & ED_SKIP) ? " S" : "",
                        (headp & ED_H) ? " H" : "",
-                       (headp & ED_C) ? "DATA1" : "DATA0");
+                       (headp & ED_C) ? data1 : data0,
+                       headp & ED_MASK,tailp);
                size -= temp;
                buf += temp;
 
-               if (ed->urb_active) {
-                       temp = scnprintf(buf, size, "\nactive urb:");
-                       size -= temp;
-                       buf += temp;
-
-                       temp = show_urb_priv(ahcd, buf, size, ed->urb_active);
+               list_for_each(entry, &ed->td_list) {
+                       u32             dbp, cbl;
+
+                       td = list_entry(entry, struct td, td_list);
+                       info = hc32_to_cpup (ahcd, &td->hwINFO);
+                       dbp = hc32_to_cpup (ahcd, &td->hwDBP);
+                       cbl = hc32_to_cpup (ahcd, &td->hwCBL);
+
+                       temp = scnprintf(buf, size,
+                               "\n\ttd/%p %s %d %s%scc=%x urb %p (%08x,%08x)",
+                               td,
+                               td_pidstring(info),
+                               TD_BL_GET(cbl),
+                               (info & TD_OWN) ? "" : "DONE ",
+                               (cbl & TD_IE) ? "IE " : "",
+                               TD_CC_GET (info), td->urb, info, cbl);
                        size -= temp;
                        buf += temp;
                }
 
-               if (!list_empty(&ed->urb_pending)) {
-                       struct list_head *entry;
-
-                       temp = scnprintf(buf, size, "\npending urbs:");
-                       size -= temp;
-                       buf += temp;
-
-                       list_for_each(entry, &ed->urb_pending) {
-                               struct urb_priv *up;
-                               up = list_entry(entry, struct urb_priv,
-                                       pending);
-
-                               temp = show_urb_priv(ahcd, buf, size, up);
-                               size -= temp;
-                               buf += temp;
-                       }
-               }
-
                temp = scnprintf(buf, size, "\n");
                size -= temp;
                buf += temp;
 
                ed = ed->ed_next;
        }
-
        return count - size;
 }
 
@@ -528,7 +483,6 @@ static CLASS_DEVICE_ATTR(async, S_IRUGO, show_async, NULL);
 static ssize_t
 show_periodic(struct class_device *class_dev, char *buf)
 {
-#if 0
        struct usb_bus          *bus;
        struct usb_hcd          *hcd;
        struct admhcd           *ahcd;
@@ -619,9 +573,6 @@ show_periodic(struct class_device *class_dev, char *buf)
        kfree (seen);
 
        return PAGE_SIZE - size;
-#else
-       return 0;
-#endif
 }
 static CLASS_DEVICE_ATTR(periodic, S_IRUGO, show_periodic, NULL);
 
@@ -731,4 +682,3 @@ static inline void remove_debug_files (struct admhcd *ahcd)
 #endif
 
 /*-------------------------------------------------------------------------*/
-
This page took 0.046293 seconds and 4 git commands to generate.