Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 264 insertions, 0 deletions

diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
new file mode 100644
index 000000000000..b611582e6bcf
--- /dev/null
+++ b/drivers/usb/host/ohci-pci.c
@@ -0,0 +1,264 @@
+/*
+ * OHCI HCD (Host Controller Driver) for USB.
+ *
+ * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
+ * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
+ * 
+ * [ Initialisation is based on Linus'  ]
+ * [ uhci code and gregs ohci fragments ]
+ * [ (C) Copyright 1999 Linus Torvalds  ]
+ * [ (C) Copyright 1999 Gregory P. Smith]
+ * 
+ * PCI Bus Glue
+ *
+ * This file is licenced under the GPL.
+ */
+ 
+#ifdef CONFIG_PMAC_PBOOK
+#include <asm/machdep.h>
+#include <asm/pmac_feature.h>
+#include <asm/pci-bridge.h>
+#include <asm/prom.h>
+#ifndef CONFIG_PM
+#       define CONFIG_PM
+#endif
+#endif
+
+#ifndef CONFIG_PCI
+#error "This file is PCI bus glue.  CONFIG_PCI must be defined."
+#endif
+
+/*-------------------------------------------------------------------------*/
+
+static int
+ohci_pci_reset (struct usb_hcd *hcd)
+{
+        struct ohci_hcd *ohci = hcd_to_ohci (hcd);
+
+        ohci_hcd_init (ohci);
+        return ohci_init (ohci);
+}
+
+static int __devinit
+ohci_pci_start (struct usb_hcd *hcd)
+{
+        struct ohci_hcd *ohci = hcd_to_ohci (hcd);
+        int             ret;
+
+        if(hcd->self.controller && hcd->self.controller->bus == &pci_bus_type) {
+                struct pci_dev *pdev = to_pci_dev(hcd->self.controller);
+
+                /* AMD 756, for most chips (early revs), corrupts register
+                 * values on read ... so enable the vendor workaround.
+                 */
+                if (pdev->vendor == PCI_VENDOR_ID_AMD
+                                && pdev->device == 0x740c) {
+                        ohci->flags = OHCI_QUIRK_AMD756;
+                        ohci_info (ohci, "AMD756 erratum 4 workaround\n");
+                        // also somewhat erratum 10 (suspend/resume issues)
+                }
+
+                /* FIXME for some of the early AMD 760 southbridges, OHCI
+                 * won't work at all.  blacklist them.
+                 */
+
+                /* Apple's OHCI driver has a lot of bizarre workarounds
+                 * for this chip.  Evidently control and bulk lists
+                 * can get confused.  (B&W G3 models, and ...)
+                 */
+                else if (pdev->vendor == PCI_VENDOR_ID_OPTI
+                                && pdev->device == 0xc861) {
+                        ohci_info (ohci,
+                                "WARNING: OPTi workarounds unavailable\n");
+                }
+
+                /* Check for NSC87560. We have to look at the bridge (fn1) to
+                 * identify the USB (fn2). This quirk might apply to more or
+                 * even all NSC stuff.
+                 */
+                else if (pdev->vendor == PCI_VENDOR_ID_NS) {
+                        struct pci_dev  *b;
+
+                        b  = pci_find_slot (pdev->bus->number,
+                                        PCI_DEVFN (PCI_SLOT (pdev->devfn), 1));
+                        if (b && b->device == PCI_DEVICE_ID_NS_87560_LIO
+                                        && b->vendor == PCI_VENDOR_ID_NS) {
+                                ohci->flags |= OHCI_QUIRK_SUPERIO;
+                                ohci_info (ohci, "Using NSC SuperIO setup\n");
+                        }
+                }
+        }
+
+        /* NOTE: there may have already been a first reset, to
+         * keep bios/smm irqs from making trouble
+         */
+        if ((ret = ohci_run (ohci)) < 0) {
+                ohci_err (ohci, "can't start\n");
+                ohci_stop (hcd);
+                return ret;
+        }
+        return 0;
+}
+
+#ifdef  CONFIG_PM
+
+static int ohci_pci_suspend (struct usb_hcd *hcd, u32 state)
+{
+        struct ohci_hcd         *ohci = hcd_to_ohci (hcd);
+
+        /* suspend root hub, hoping it keeps power during suspend */
+        if (time_before (jiffies, ohci->next_statechange))
+                msleep (100);
+
+#ifdef  CONFIG_USB_SUSPEND
+        (void) usb_suspend_device (hcd->self.root_hub, state);
+#else
+        usb_lock_device (hcd->self.root_hub);
+        (void) ohci_hub_suspend (hcd);
+        usb_unlock_device (hcd->self.root_hub);
+#endif
+
+        /* let things settle down a bit */
+        msleep (100);
+        
+#ifdef CONFIG_PMAC_PBOOK
+        if (_machine == _MACH_Pmac) {
+                struct device_node      *of_node;
+ 
+                /* Disable USB PAD & cell clock */
+                of_node = pci_device_to_OF_node (to_pci_dev(hcd->self.controller));
+                if (of_node)
+                        pmac_call_feature(PMAC_FTR_USB_ENABLE, of_node, 0, 0);
+        }
+#endif /* CONFIG_PMAC_PBOOK */
+        return 0;
+}
+
+
+static int ohci_pci_resume (struct usb_hcd *hcd)
+{
+        struct ohci_hcd         *ohci = hcd_to_ohci (hcd);
+        int                     retval = 0;
+
+#ifdef CONFIG_PMAC_PBOOK
+        if (_machine == _MACH_Pmac) {
+                struct device_node *of_node;
+
+                /* Re-enable USB PAD & cell clock */
+                of_node = pci_device_to_OF_node (to_pci_dev(hcd->self.controller));
+                if (of_node)
+                        pmac_call_feature (PMAC_FTR_USB_ENABLE, of_node, 0, 1);
+        }
+#endif /* CONFIG_PMAC_PBOOK */
+
+        /* resume root hub */
+        if (time_before (jiffies, ohci->next_statechange))
+                msleep (100);
+#ifdef  CONFIG_USB_SUSPEND
+        /* get extra cleanup even if remote wakeup isn't in use */
+        retval = usb_resume_device (hcd->self.root_hub);
+#else
+        usb_lock_device (hcd->self.root_hub);
+        retval = ohci_hub_resume (hcd);
+        usb_unlock_device (hcd->self.root_hub);
+#endif
+
+        return retval;
+}
+
+#endif  /* CONFIG_PM */
+
+
+/*-------------------------------------------------------------------------*/
+
+static const struct hc_driver ohci_pci_hc_driver = {
+        .description =          hcd_name,
+        .product_desc =         "OHCI Host Controller",
+        .hcd_priv_size =        sizeof(struct ohci_hcd),
+
+        /*
+         * generic hardware linkage
+         */
+        .irq =                  ohci_irq,
+        .flags =                HCD_MEMORY | HCD_USB11,
+
+        /*
+         * basic lifecycle operations
+         */
+        .reset =                ohci_pci_reset,
+        .start =                ohci_pci_start,
+#ifdef  CONFIG_PM
+        .suspend =              ohci_pci_suspend,
+        .resume =               ohci_pci_resume,
+#endif
+        .stop =                 ohci_stop,
+
+        /*
+         * managing i/o requests and associated device resources
+         */
+        .urb_enqueue =          ohci_urb_enqueue,
+        .urb_dequeue =          ohci_urb_dequeue,
+        .endpoint_disable =     ohci_endpoint_disable,
+
+        /*
+         * scheduling support
+         */
+        .get_frame_number =     ohci_get_frame,
+
+        /*
+         * root hub support
+         */
+        .hub_status_data =      ohci_hub_status_data,
+        .hub_control =          ohci_hub_control,
+#ifdef  CONFIG_USB_SUSPEND
+        .hub_suspend =          ohci_hub_suspend,
+        .hub_resume =           ohci_hub_resume,
+#endif
+        .start_port_reset =     ohci_start_port_reset,
+};
+
+/*-------------------------------------------------------------------------*/
+
+
+static const struct pci_device_id pci_ids [] = { {
+        /* handle any USB OHCI controller */
+        PCI_DEVICE_CLASS((PCI_CLASS_SERIAL_USB << 8) | 0x10, ~0),
+        .driver_data =  (unsigned long) &ohci_pci_hc_driver,
+        }, { /* end: all zeroes */ }
+};
+MODULE_DEVICE_TABLE (pci, pci_ids);
+
+/* pci driver glue; this is a "new style" PCI driver module */
+static struct pci_driver ohci_pci_driver = {
+        .name =         (char *) hcd_name,
+        .id_table =     pci_ids,
+
+        .probe =        usb_hcd_pci_probe,
+        .remove =       usb_hcd_pci_remove,
+
+#ifdef  CONFIG_PM
+        .suspend =      usb_hcd_pci_suspend,
+        .resume =       usb_hcd_pci_resume,
+#endif
+};
+
+ 
+static int __init ohci_hcd_pci_init (void) 
+{
+        printk (KERN_DEBUG "%s: " DRIVER_INFO " (PCI)\n", hcd_name);
+        if (usb_disabled())
+                return -ENODEV;
+
+        pr_debug ("%s: block sizes: ed %Zd td %Zd\n", hcd_name,
+                sizeof (struct ed), sizeof (struct td));
+        return pci_register_driver (&ohci_pci_driver);
+}
+module_init (ohci_hcd_pci_init);
+
+/*-------------------------------------------------------------------------*/
+
+static void __exit ohci_hcd_pci_cleanup (void) 
+{       
+        pci_unregister_driver (&ohci_pci_driver);
+}
+module_exit (ohci_hcd_pci_cleanup);