[PATCH] USB: misc ehci updates

Various minor EHCI updates

   * Dump some more info in the debug dumps, notably the product
     description (e.g. chip vendor), BIOS handhake flags, and
     debug port status (when it's not managed by the HCD).

   * Minor updates to the BIOS handoff code:  always flag the HCD
     as owned by Linux (in case BIOS doesn't grab it "early"),
     and on the buggy-BIOS path always match the "early handoff"
     code and forcibly disable SMI IRQs.

   * For the disabled 64bit DMA support, there's now a constant
     to use for the mask; use it.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index 2ff11d5..50cb018 100644 (file)
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -254,7 +254,7 @@ dbg_port_buf (char *buf, unsigned len, const char *label, int port, u32 status)
        }
 
        return scnprintf (buf, len,
-               "%s%sport %d status %06x%s%s sig=%s %s%s%s%s%s%s%s%s%s",
+               "%s%sport %d status %06x%s%s sig=%s%s%s%s%s%s%s%s%s%s",
                label, label [0] ? " " : "", port, status,
                (status & PORT_POWER) ? " POWER" : "",
                (status & PORT_OWNER) ? " OWNER" : "",
@@ -644,9 +644,11 @@ show_registers (struct class_device *class_dev, char *buf)
        if (bus->controller->power.power_state) {
                size = scnprintf (next, size,
                        "bus %s, device %s (driver " DRIVER_VERSION ")\n"
+                       "%s\n"
                        "SUSPENDED (no register access)\n",
                        hcd->self.controller->bus->name,
-                       hcd->self.controller->bus_id);
+                       hcd->self.controller->bus_id,
+                       hcd->product_desc);
                goto done;
        }
 
@@ -654,13 +656,53 @@ show_registers (struct class_device *class_dev, char *buf)
        i = HC_VERSION(readl (&ehci->caps->hc_capbase));
        temp = scnprintf (next, size,
                "bus %s, device %s (driver " DRIVER_VERSION ")\n"
+               "%s\n"
                "EHCI %x.%02x, hcd state %d\n",
                hcd->self.controller->bus->name,
                hcd->self.controller->bus_id,
+               hcd->product_desc,
                i >> 8, i & 0x0ff, hcd->state);
        size -= temp;
        next += temp;
 
+#ifdef CONFIG_PCI
+       /* EHCI 0.96 and later may have "extended capabilities" */
+       if (hcd->self.controller->bus == &pci_bus_type) {
+               struct pci_dev  *pdev;
+               u32             offset, cap, cap2;
+               unsigned        count = 256/4;
+
+               pdev = to_pci_dev(ehci_to_hcd(ehci)->self.controller);
+               offset = HCC_EXT_CAPS (readl (&ehci->caps->hcc_params));
+               while (offset && count--) {
+                       pci_read_config_dword (pdev, offset, &cap);
+                       switch (cap & 0xff) {
+                       case 1:
+                               temp = scnprintf (next, size,
+                                       "ownership %08x%s%s\n", cap,
+                                       (cap & (1 << 24)) ? " linux" : "",
+                                       (cap & (1 << 16)) ? " firmware" : "");
+                               size -= temp;
+                               next += temp;
+
+                               offset += 4;
+                               pci_read_config_dword (pdev, offset, &cap2);
+                               temp = scnprintf (next, size,
+                                       "SMI sts/enable 0x%08x\n", cap2);
+                               size -= temp;
+                               next += temp;
+                               break;
+                       case 0:         /* illegal reserved capability */
+                               cap = 0;
+                               /* FALLTHROUGH */
+                       default:                /* unknown */
+                               break;
+                       }
+                       temp = (cap >> 8) & 0xff;
+               }
+       }
+#endif
+
        // FIXME interpret both types of params
        i = readl (&ehci->caps->hcs_params);
        temp = scnprintf (next, size, "structural params 0x%08x\n", i);
@@ -696,12 +738,19 @@ show_registers (struct class_device *class_dev, char *buf)
        size -= temp;
        next += temp;
 
-       for (i = 0; i < HCS_N_PORTS (ehci->hcs_params); i++) {
-               temp = dbg_port_buf (scratch, sizeof scratch, label, i + 1,
-                               readl (&ehci->regs->port_status [i]));
+       for (i = 1; i <= HCS_N_PORTS (ehci->hcs_params); i++) {
+               temp = dbg_port_buf (scratch, sizeof scratch, label, i,
+                               readl (&ehci->regs->port_status [i - 1]));
                temp = scnprintf (next, size, fmt, temp, scratch);
                size -= temp;
                next += temp;
+               if (i == HCS_DEBUG_PORT(ehci->hcs_params) && ehci->debug) {
+                       temp = scnprintf (next, size,
+                                       "    debug control %08x\n",
+                                       readl (&ehci->debug->control));
+                       size -= temp;
+                       next += temp;
+               }
        }
 
        if (ehci->reclaim) {

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 527abc6..35248a3 100644 (file)
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -304,30 +304,31 @@ static void ehci_watchdog (unsigned long param)
  */
 static int bios_handoff (struct ehci_hcd *ehci, int where, u32 cap)
 {
+       struct pci_dev *pdev = to_pci_dev(ehci_to_hcd(ehci)->self.controller);
+
+       /* always say Linux will own the hardware */
+       pci_write_config_byte(pdev, where + 3, 1);
+
+       /* maybe wait a while for BIOS to respond */
        if (cap & (1 << 16)) {
                int msec = 5000;
-               struct pci_dev *pdev =
-                               to_pci_dev(ehci_to_hcd(ehci)->self.controller);
 
-               /* request handoff to OS */
-               cap |= 1 << 24;
-               pci_write_config_dword(pdev, where, cap);
-
-               /* and wait a while for it to happen */
                do {
                        msleep(10);
                        msec -= 10;
                        pci_read_config_dword(pdev, where, &cap);
                } while ((cap & (1 << 16)) && msec);
                if (cap & (1 << 16)) {
-                       ehci_err (ehci, "BIOS handoff failed (%d, %04x)\n",
+                       ehci_err(ehci, "BIOS handoff failed (%d, %08x)\n",
                                where, cap);
                        // some BIOS versions seem buggy...
                        // return 1;
                        ehci_warn (ehci, "continuing after BIOS bug...\n");
-                       return 0;
-               } 
-               ehci_dbg (ehci, "BIOS handoff succeeded\n");
+                       /* disable all SMIs, and clear "BIOS owns" flag */
+                       pci_write_config_dword(pdev, where + 4, 0);
+                       pci_write_config_byte(pdev, where + 2, 0);
+               } else
+                       ehci_dbg(ehci, "BIOS handoff succeeded\n");
        }
        return 0;
 }
@@ -586,8 +587,8 @@ static int ehci_start (struct usb_hcd *hcd)
                writel (0, &ehci->regs->segment);
 #if 0
 // this is deeply broken on almost all architectures
-               if (!pci_set_dma_mask (to_pci_dev(hcd->self.controller), 0xffffffffffffffffULL))
-                       ehci_info (ehci, "enabled 64bit PCI DMA\n");
+               if (!dma_set_mask (hcd->self.controller, DMA_64BIT_MASK))
+                       ehci_info (ehci, "enabled 64bit DMA\n");
 #endif
        }
 

diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index d7b4f79..36cc1f2 100644 (file)
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2002 by David Brownell
+ * Copyright (C) 2001-2004 by David Brownell
  * 
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index 7df9b9a..45d89a7 100644 (file)
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2002 by David Brownell
+ * Copyright (C) 2001-2004 by David Brownell
  * 
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the