1 files changed, 27 insertions, 81 deletions

diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index cb16de213f64..ef98b38626fb 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -22,6 +22,7 @@
 
 #include <linux/pci.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 
 #include "xhci.h"
 
@@ -51,61 +52,9 @@ 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;
-        struct pci_dev          *pdev = to_pci_dev(hcd->self.controller);
-        int                     retval;
-        u32                     temp;
-
-        hcd->self.sg_tablesize = TRBS_PER_SEGMENT - 2;
-
-        if (usb_hcd_is_primary_hcd(hcd)) {
-                xhci = kzalloc(sizeof(struct xhci_hcd), GFP_KERNEL);
-                if (!xhci)
-                        return -ENOMEM;
-                *((struct xhci_hcd **) hcd->hcd_priv) = xhci;
-                xhci->main_hcd = hcd;
-                /* Mark the first roothub as being USB 2.0.
-                 * The xHCI driver will register the USB 3.0 roothub.
-                 */
-                hcd->speed = HCD_USB2;
-                hcd->self.root_hub->speed = USB_SPEED_HIGH;
-                /*
-                 * USB 2.0 roothub under xHCI has an integrated TT,
-                 * (rate matching hub) as opposed to having an OHCI/UHCI
-                 * companion controller.
-                 */
-                hcd->has_tt = 1;
-        } else {
-                /* xHCI private pointer was set in xhci_pci_probe for the second
-                 * registered roothub.
-                 */
-                xhci = hcd_to_xhci(hcd);
-                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));
-                }
-                return 0;
-        }
-
-        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 &&
@@ -128,6 +77,9 @@ static int xhci_pci_setup(struct usb_hcd *hcd)
         if (pdev->vendor == PCI_VENDOR_ID_NEC)
                 xhci->quirks |= XHCI_NEC_HOST;
 
+        if (pdev->vendor == PCI_VENDOR_ID_AMD && xhci->hci_version == 0x96)
+                xhci->quirks |= XHCI_AMD_0x96_HOST;
+
         /* AMD PLL quirk */
         if (pdev->vendor == PCI_VENDOR_ID_AMD && usb_amd_find_chipset_info())
                 xhci->quirks |= XHCI_AMD_PLL_FIX;
@@ -136,39 +88,29 @@ static int xhci_pci_setup(struct usb_hcd *hcd)
                 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");
         }
+}
 
-        /* Make sure the HC is halted. */
-        retval = xhci_halt(xhci);
-        if (retval)
-                goto error;
+/* 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, "Resetting HCD\n");
-        /* Reset the internal HC memory state and registers. */
-        retval = xhci_reset(xhci);
+        retval = xhci_gen_setup(hcd, xhci_pci_quirks);
         if (retval)
-                goto error;
-        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));
-        }
+                return retval;
 
-        xhci_dbg(xhci, "Calling HCD init\n");
-        /* Initialize HCD and host controller data structures. */
-        retval = xhci_init(hcd);
-        if (retval)
-                goto error;
-        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);
@@ -178,7 +120,6 @@ static int xhci_pci_setup(struct usb_hcd *hcd)
         if (!retval)
                 return retval;
 
-error:
         kfree(xhci);
         return retval;
 }
@@ -222,7 +163,7 @@ static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
         *((struct xhci_hcd **) xhci->shared_hcd->hcd_priv) = xhci;
 
         retval = usb_add_hcd(xhci->shared_hcd, dev->irq,
-                        IRQF_DISABLED | IRQF_SHARED);
+                        IRQF_SHARED);
         if (retval)
                 goto put_usb3_hcd;
         /* Roothub already marked as USB 3.0 speed */
@@ -344,6 +285,11 @@ static const struct hc_driver xhci_pci_hc_driver = {
         .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,
 };
 
 /*-------------------------------------------------------------------------*/
@@ -375,12 +321,12 @@ static struct pci_driver xhci_pci_driver = {
 #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);
 }