xHCI: add XHCI_RESET_ON_RESUME quirk for VIA xHCI host
[linux-flexiantxendom0.git] / drivers / usb / host / xhci-pci.c
index f7efe02..211296a 100644 (file)
@@ -21,6 +21,8 @@
  */
 
 #include <linux/pci.h>
+#include <linux/slab.h>
+#include <linux/module.h>
 
 #include "xhci.h"
 
@@ -28,6 +30,9 @@
 #define PCI_VENDOR_ID_FRESCO_LOGIC     0x1b73
 #define PCI_DEVICE_ID_FRESCO_LOGIC_PDK 0x1000
 
+#define PCI_VENDOR_ID_ETRON            0x1b6f
+#define PCI_DEVICE_ID_ASROCK_P67       0x7023
+
 static const char hcd_name[] = "xhci_hcd";
 
 /* called after powerup, by probe or system-pm "wakeup" */
@@ -47,92 +52,210 @@ static int xhci_pci_reinit(struct xhci_hcd *xhci, struct pci_dev *pdev)
        return 0;
 }
 
-/* called during probe() after chip reset completes */
-static int xhci_pci_setup(struct usb_hcd *hcd)
+static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
 {
-       struct xhci_hcd         *xhci = hcd_to_xhci(hcd);
-       struct pci_dev          *pdev = to_pci_dev(hcd->self.controller);
-       int                     retval;
-       u32                     temp;
-
-       hcd->self.sg_tablesize = TRBS_PER_SEGMENT - 2;
-
-       xhci->cap_regs = hcd->regs;
-       xhci->op_regs = hcd->regs +
-               HC_LENGTH(xhci_readl(xhci, &xhci->cap_regs->hc_capbase));
-       xhci->run_regs = hcd->regs +
-               (xhci_readl(xhci, &xhci->cap_regs->run_regs_off) & RTSOFF_MASK);
-       /* Cache read-only capability registers */
-       xhci->hcs_params1 = xhci_readl(xhci, &xhci->cap_regs->hcs_params1);
-       xhci->hcs_params2 = xhci_readl(xhci, &xhci->cap_regs->hcs_params2);
-       xhci->hcs_params3 = xhci_readl(xhci, &xhci->cap_regs->hcs_params3);
-       xhci->hcc_params = xhci_readl(xhci, &xhci->cap_regs->hc_capbase);
-       xhci->hci_version = HC_VERSION(xhci->hcc_params);
-       xhci->hcc_params = xhci_readl(xhci, &xhci->cap_regs->hcc_params);
-       xhci_print_registers(xhci);
+       struct pci_dev          *pdev = to_pci_dev(dev);
 
        /* Look for vendor-specific quirks */
        if (pdev->vendor == PCI_VENDOR_ID_FRESCO_LOGIC &&
-                       pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK &&
-                       pdev->revision == 0x0) {
+                       pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK) {
+               if (pdev->revision == 0x0) {
                        xhci->quirks |= XHCI_RESET_EP_QUIRK;
                        xhci_dbg(xhci, "QUIRK: Fresco Logic xHC needs configure"
                                        " endpoint cmd after reset endpoint\n");
+               }
+               /* Fresco Logic confirms: all revisions of this chip do not
+                * support MSI, even though some of them claim to in their PCI
+                * capabilities.
+                */
+               xhci->quirks |= XHCI_BROKEN_MSI;
+               xhci_dbg(xhci, "QUIRK: Fresco Logic revision %u "
+                               "has broken MSI implementation\n",
+                               pdev->revision);
        }
+
        if (pdev->vendor == PCI_VENDOR_ID_NEC)
                xhci->quirks |= XHCI_NEC_HOST;
 
-       /* Make sure the HC is halted. */
-       retval = xhci_halt(xhci);
-       if (retval)
-               return retval;
+       if (pdev->vendor == PCI_VENDOR_ID_AMD && xhci->hci_version == 0x96)
+               xhci->quirks |= XHCI_AMD_0x96_HOST;
 
-       xhci_dbg(xhci, "Resetting HCD\n");
-       /* Reset the internal HC memory state and registers. */
-       retval = xhci_reset(xhci);
-       if (retval)
-               return retval;
-       xhci_dbg(xhci, "Reset complete\n");
-
-       temp = xhci_readl(xhci, &xhci->cap_regs->hcc_params);
-       if (HCC_64BIT_ADDR(temp)) {
-               xhci_dbg(xhci, "Enabling 64-bit DMA addresses.\n");
-               dma_set_mask(hcd->self.controller, DMA_BIT_MASK(64));
-       } else {
-               dma_set_mask(hcd->self.controller, DMA_BIT_MASK(32));
+       /* AMD PLL quirk */
+       if (pdev->vendor == PCI_VENDOR_ID_AMD && usb_amd_find_chipset_info())
+               xhci->quirks |= XHCI_AMD_PLL_FIX;
+       if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
+                       pdev->device == PCI_DEVICE_ID_INTEL_PANTHERPOINT_XHCI) {
+               xhci->quirks |= XHCI_SPURIOUS_SUCCESS;
+               xhci->quirks |= XHCI_EP_LIMIT_QUIRK;
+               xhci->limit_active_eps = 64;
+               xhci->quirks |= XHCI_SW_BW_CHECKING;
+       }
+       if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
+                       pdev->device == PCI_DEVICE_ID_ASROCK_P67) {
+               xhci->quirks |= XHCI_RESET_ON_RESUME;
+               xhci_dbg(xhci, "QUIRK: Resetting on resume\n");
        }
+       if (pdev->vendor == PCI_VENDOR_ID_VIA)
+               xhci->quirks |= XHCI_RESET_ON_RESUME;
+}
+
+/* called during probe() after chip reset completes */
+static int xhci_pci_setup(struct usb_hcd *hcd)
+{
+       struct xhci_hcd         *xhci;
+       struct pci_dev          *pdev = to_pci_dev(hcd->self.controller);
+       int                     retval;
 
-       xhci_dbg(xhci, "Calling HCD init\n");
-       /* Initialize HCD and host controller data structures. */
-       retval = xhci_init(hcd);
+       retval = xhci_gen_setup(hcd, xhci_pci_quirks);
        if (retval)
                return retval;
-       xhci_dbg(xhci, "Called HCD init\n");
+
+       xhci = hcd_to_xhci(hcd);
+       if (!usb_hcd_is_primary_hcd(hcd))
+               return 0;
 
        pci_read_config_byte(pdev, XHCI_SBRN_OFFSET, &xhci->sbrn);
        xhci_dbg(xhci, "Got SBRN %u\n", (unsigned int) xhci->sbrn);
 
        /* Find any debug ports */
-       return xhci_pci_reinit(xhci, pdev);
+       retval = xhci_pci_reinit(xhci, pdev);
+       if (!retval)
+               return retval;
+
+       kfree(xhci);
+       return retval;
 }
 
+/*
+ * We need to register our own PCI probe function (instead of the USB core's
+ * function) in order to create a second roothub under xHCI.
+ */
+static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
+{
+       int retval;
+       struct xhci_hcd *xhci;
+       struct hc_driver *driver;
+       struct usb_hcd *hcd;
+
+       driver = (struct hc_driver *)id->driver_data;
+       /* Register the USB 2.0 roothub.
+        * FIXME: USB core must know to register the USB 2.0 roothub first.
+        * This is sort of silly, because we could just set the HCD driver flags
+        * to say USB 2.0, but I'm not sure what the implications would be in
+        * the other parts of the HCD code.
+        */
+       retval = usb_hcd_pci_probe(dev, id);
+
+       if (retval)
+               return retval;
+
+       /* USB 2.0 roothub is stored in the PCI device now. */
+       hcd = dev_get_drvdata(&dev->dev);
+       xhci = hcd_to_xhci(hcd);
+       xhci->shared_hcd = usb_create_shared_hcd(driver, &dev->dev,
+                               pci_name(dev), hcd);
+       if (!xhci->shared_hcd) {
+               retval = -ENOMEM;
+               goto dealloc_usb2_hcd;
+       }
+
+       /* Set the xHCI pointer before xhci_pci_setup() (aka hcd_driver.reset)
+        * is called by usb_add_hcd().
+        */
+       *((struct xhci_hcd **) xhci->shared_hcd->hcd_priv) = xhci;
+
+       retval = usb_add_hcd(xhci->shared_hcd, dev->irq,
+                       IRQF_SHARED);
+       if (retval)
+               goto put_usb3_hcd;
+       /* Roothub already marked as USB 3.0 speed */
+       return 0;
+
+put_usb3_hcd:
+       usb_put_hcd(xhci->shared_hcd);
+dealloc_usb2_hcd:
+       usb_hcd_pci_remove(dev);
+       return retval;
+}
+
+static void xhci_pci_remove(struct pci_dev *dev)
+{
+       struct xhci_hcd *xhci;
+
+       xhci = hcd_to_xhci(pci_get_drvdata(dev));
+       if (xhci->shared_hcd) {
+               usb_remove_hcd(xhci->shared_hcd);
+               usb_put_hcd(xhci->shared_hcd);
+       }
+       usb_hcd_pci_remove(dev);
+       kfree(xhci);
+}
+
+#ifdef CONFIG_PM
+static int xhci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup)
+{
+       struct xhci_hcd *xhci = hcd_to_xhci(hcd);
+       int     retval = 0;
+
+       if (hcd->state != HC_STATE_SUSPENDED ||
+                       xhci->shared_hcd->state != HC_STATE_SUSPENDED)
+               return -EINVAL;
+
+       retval = xhci_suspend(xhci);
+
+       return retval;
+}
+
+static int xhci_pci_resume(struct usb_hcd *hcd, bool hibernated)
+{
+       struct xhci_hcd         *xhci = hcd_to_xhci(hcd);
+       struct pci_dev          *pdev = to_pci_dev(hcd->self.controller);
+       int                     retval = 0;
+
+       /* The BIOS on systems with the Intel Panther Point chipset may or may
+        * not support xHCI natively.  That means that during system resume, it
+        * may switch the ports back to EHCI so that users can use their
+        * keyboard to select a kernel from GRUB after resume from hibernate.
+        *
+        * The BIOS is supposed to remember whether the OS had xHCI ports
+        * enabled before resume, and switch the ports back to xHCI when the
+        * BIOS/OS semaphore is written, but we all know we can't trust BIOS
+        * writers.
+        *
+        * Unconditionally switch the ports back to xHCI after a system resume.
+        * We can't tell whether the EHCI or xHCI controller will be resumed
+        * first, so we have to do the port switchover in both drivers.  Writing
+        * a '1' to the port switchover registers should have no effect if the
+        * port was already switched over.
+        */
+       if (usb_is_intel_switchable_xhci(pdev))
+               usb_enable_xhci_ports(pdev);
+
+       retval = xhci_resume(xhci, hibernated);
+       return retval;
+}
+#endif /* CONFIG_PM */
+
 static const struct hc_driver xhci_pci_hc_driver = {
        .description =          hcd_name,
        .product_desc =         "xHCI Host Controller",
-       .hcd_priv_size =        sizeof(struct xhci_hcd),
+       .hcd_priv_size =        sizeof(struct xhci_hcd *),
 
        /*
         * generic hardware linkage
         */
        .irq =                  xhci_irq,
-       .flags =                HCD_MEMORY | HCD_USB3,
+       .flags =                HCD_MEMORY | HCD_USB3 | HCD_SHARED,
 
        /*
         * basic lifecycle operations
         */
        .reset =                xhci_pci_setup,
        .start =                xhci_run,
-       /* suspend and resume implemented later */
+#ifdef CONFIG_PM
+       .pci_suspend =          xhci_pci_suspend,
+       .pci_resume =           xhci_pci_resume,
+#endif
        .stop =                 xhci_stop,
        .shutdown =             xhci_shutdown,
 
@@ -152,7 +275,7 @@ static const struct hc_driver xhci_pci_hc_driver = {
        .reset_bandwidth =      xhci_reset_bandwidth,
        .address_device =       xhci_address_device,
        .update_hub_device =    xhci_update_hub_device,
-       .reset_device =         xhci_reset_device,
+       .reset_device =         xhci_discover_or_reset_device,
 
        /*
         * scheduling support
@@ -162,6 +285,13 @@ static const struct hc_driver xhci_pci_hc_driver = {
        /* Root hub support */
        .hub_control =          xhci_hub_control,
        .hub_status_data =      xhci_hub_status_data,
+       .bus_suspend =          xhci_bus_suspend,
+       .bus_resume =           xhci_bus_resume,
+       /*
+        * call back when device connected and addressed
+        */
+       .update_device =        xhci_update_device,
+       .set_usb2_hw_lpm =      xhci_set_usb2_hardware_lpm,
 };
 
 /*-------------------------------------------------------------------------*/
@@ -181,19 +311,24 @@ static struct pci_driver xhci_pci_driver = {
        .name =         (char *) hcd_name,
        .id_table =     pci_ids,
 
-       .probe =        usb_hcd_pci_probe,
-       .remove =       usb_hcd_pci_remove,
+       .probe =        xhci_pci_probe,
+       .remove =       xhci_pci_remove,
        /* suspend and resume implemented later */
 
        .shutdown =     usb_hcd_pci_shutdown,
+#ifdef CONFIG_PM_SLEEP
+       .driver = {
+               .pm = &usb_hcd_pci_pm_ops
+       },
+#endif
 };
 
-int xhci_register_pci(void)
+int __init xhci_register_pci(void)
 {
        return pci_register_driver(&xhci_pci_driver);
 }
 
-void xhci_unregister_pci(void)
+void __exit xhci_unregister_pci(void)
 {
        pci_unregister_driver(&xhci_pci_driver);
 }