1 files changed, 42 insertions, 14 deletions

diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 58c43ed7ff3b..f0640b7a1c42 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -28,7 +28,9 @@
 #include "xhci.h"
 #include "xhci-trace.h"
 
-#define PORT2_SSIC_CONFIG_REG2  0x883c
+#define SSIC_PORT_NUM           2
+#define SSIC_PORT_CFG2          0x880c
+#define SSIC_PORT_CFG2_OFFSET   0x30
 #define PROG_DONE               (1 << 30)
 #define SSIC_PORT_UNUSED        (1 << 31)
 
@@ -45,6 +47,7 @@
 #define PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI             0x22b5
 #define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_H_XHCI         0xa12f
 #define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_XHCI        0x9d2f
+#define PCI_DEVICE_ID_INTEL_BROXTON_M_XHCI              0x0aa8
 
 static const char hcd_name[] = "xhci_hcd";
 
@@ -151,9 +154,14 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
         if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
                 (pdev->device == PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_XHCI ||
                  pdev->device == PCI_DEVICE_ID_INTEL_SUNRISEPOINT_H_XHCI ||
-                 pdev->device == PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI)) {
+                 pdev->device == PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI ||
+                 pdev->device == PCI_DEVICE_ID_INTEL_BROXTON_M_XHCI)) {
                 xhci->quirks |= XHCI_PME_STUCK_QUIRK;
         }
+        if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
+                 pdev->device == PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI) {
+                xhci->quirks |= XHCI_SSIC_PORT_UNUSED;
+        }
         if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
                         pdev->device == PCI_DEVICE_ID_EJ168) {
                 xhci->quirks |= XHCI_RESET_ON_RESUME;
@@ -312,22 +320,20 @@ static void xhci_pci_remove(struct pci_dev *dev)
  * SSIC PORT need to be marked as "unused" before putting xHCI
  * into D3. After D3 exit, the SSIC port need to be marked as "used".
  * Without this change, xHCI might not enter D3 state.
- * Make sure PME works on some Intel xHCI controllers by writing 1 to clear
- * the Internal PME flag bit in vendor specific PMCTRL register at offset 0x80a4
  */
-static void xhci_pme_quirk(struct usb_hcd *hcd, bool suspend)
+static void xhci_ssic_port_unused_quirk(struct usb_hcd *hcd, bool suspend)
 {
         struct xhci_hcd *xhci = hcd_to_xhci(hcd);
-        struct pci_dev          *pdev = to_pci_dev(hcd->self.controller);
         u32 val;
         void __iomem *reg;
+        int i;
 
-        if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
-                 pdev->device == PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI) {
-
-                reg = (void __iomem *) xhci->cap_regs + PORT2_SSIC_CONFIG_REG2;
+        for (i = 0; i < SSIC_PORT_NUM; i++) {
+                reg = (void __iomem *) xhci->cap_regs +
+                                SSIC_PORT_CFG2 +
+                                i * SSIC_PORT_CFG2_OFFSET;
 
-                /* Notify SSIC that SSIC profile programming is not done */
+                /* Notify SSIC that SSIC profile programming is not done. */
                 val = readl(reg) & ~PROG_DONE;
                 writel(val, reg);
 
@@ -344,6 +350,17 @@ static void xhci_pme_quirk(struct usb_hcd *hcd, bool suspend)
                 writel(val, reg);
                 readl(reg);
         }
+}
+
+/*
+ * Make sure PME works on some Intel xHCI controllers by writing 1 to clear
+ * the Internal PME flag bit in vendor specific PMCTRL register at offset 0x80a4
+ */
+static void xhci_pme_quirk(struct usb_hcd *hcd)
+{
+        struct xhci_hcd *xhci = hcd_to_xhci(hcd);
+        void __iomem *reg;
+        u32 val;
 
         reg = (void __iomem *) xhci->cap_regs + 0x80a4;
         val = readl(reg);
@@ -355,6 +372,7 @@ static int xhci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup)
 {
         struct xhci_hcd *xhci = hcd_to_xhci(hcd);
         struct pci_dev          *pdev = to_pci_dev(hcd->self.controller);
+        int                     ret;
 
         /*
          * Systems with the TI redriver that loses port status change events
@@ -364,9 +382,16 @@ static int xhci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup)
                 pdev->no_d3cold = true;
 
         if (xhci->quirks & XHCI_PME_STUCK_QUIRK)
-                xhci_pme_quirk(hcd, true);
+                xhci_pme_quirk(hcd);
+
+        if (xhci->quirks & XHCI_SSIC_PORT_UNUSED)
+                xhci_ssic_port_unused_quirk(hcd, true);
 
-        return xhci_suspend(xhci, do_wakeup);
+        ret = xhci_suspend(xhci, do_wakeup);
+        if (ret && (xhci->quirks & XHCI_SSIC_PORT_UNUSED))
+                xhci_ssic_port_unused_quirk(hcd, false);
+
+        return ret;
 }
 
 static int xhci_pci_resume(struct usb_hcd *hcd, bool hibernated)
@@ -396,8 +421,11 @@ static int xhci_pci_resume(struct usb_hcd *hcd, bool hibernated)
         if (pdev->vendor == PCI_VENDOR_ID_INTEL)
                 usb_enable_intel_xhci_ports(pdev);
 
+        if (xhci->quirks & XHCI_SSIC_PORT_UNUSED)
+                xhci_ssic_port_unused_quirk(hcd, false);
+
         if (xhci->quirks & XHCI_PME_STUCK_QUIRK)
-                xhci_pme_quirk(hcd, false);
+                xhci_pme_quirk(hcd);
 
         retval = xhci_resume(xhci, hibernated);
         return retval;