Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e70cbff authored by Lu Baolu's avatar Lu Baolu Committed by Greg Kroah-Hartman
Browse files

usb: xhci: add a quirk bit for ssic port unused 



Two workarounds introduced by commit b8cb91e0 ("xhci: Workaround
for PME stuck issues in Intel xhci") and commit abce329c ("xhci:
Workaround to get D3 working in Intel xHCI") share a single quirk bit
XHCI_PME_STUCK_QUIRK. These two workarounds actually are different and
might happen on different hardwares. Need to separate them by adding a
quirk bit for the later.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fa895377

drivers/usb/host/xhci-pci.c

+45 −34
Original line number Diff line number Diff line
@@ -156,6 +156,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) 
		 pdev->device == PCI_DEVICE_ID_INTEL_CHERRYVIEW_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;
@@ -314,29 +318,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) {



	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);
@@ -355,6 +350,16 @@ static void xhci_pme_quirk(struct usb_hcd *hcd, bool suspend) 
	}

}



/*

 * 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);

	writel(val | BIT(28), reg);
@@ -374,7 +379,10 @@ 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);

}
@@ -406,8 +414,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;

drivers/usb/host/xhci.h

+1 −0
Original line number Diff line number Diff line
@@ -1631,6 +1631,7 @@ struct xhci_hcd { 
#define XHCI_BROKEN_STREAMS	(1 << 19)

#define XHCI_PME_STUCK_QUIRK	(1 << 20)

#define XHCI_MTK_HOST		(1 << 21)

#define XHCI_SSIC_PORT_UNUSED	(1 << 22)

	unsigned int		num_active_eps;

	unsigned int		limit_active_eps;

	/* There are two roothubs to keep track of bus suspend info for */