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

Commit 6ca274be authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: apply XHCI_PME_STUCK_QUIRK to Intel Comet Lake platforms 



commit a3ae87dce3a5abe0b57c811bab02b2564b574106 upstream.

Intel Comet Lake based platform require the XHCI_PME_STUCK_QUIRK
quirk as well. Without this xHC can not enter D3 in runtime suspend.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20200210134553.9144-5-mathias.nyman@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8300ed5a

drivers/usb/host/xhci-pci.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -41,6 +41,7 @@ 
#define PCI_DEVICE_ID_INTEL_BROXTON_B_XHCI		0x1aa8

#define PCI_DEVICE_ID_INTEL_BROXTON_B_XHCI		0x1aa8

#define PCI_DEVICE_ID_INTEL_APL_XHCI			0x5aa8

#define PCI_DEVICE_ID_INTEL_APL_XHCI			0x5aa8

#define PCI_DEVICE_ID_INTEL_DNV_XHCI			0x19d0

#define PCI_DEVICE_ID_INTEL_DNV_XHCI			0x19d0

#define PCI_DEVICE_ID_INTEL_CML_XHCI			0xa3af





#define PCI_DEVICE_ID_AMD_PROMONTORYA_4			0x43b9

#define PCI_DEVICE_ID_AMD_PROMONTORYA_4			0x43b9

#define PCI_DEVICE_ID_AMD_PROMONTORYA_3			0x43ba

#define PCI_DEVICE_ID_AMD_PROMONTORYA_3			0x43ba
@@ -179,7 +180,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) 
		 pdev->device == PCI_DEVICE_ID_INTEL_BROXTON_M_XHCI ||

		 pdev->device == PCI_DEVICE_ID_INTEL_BROXTON_M_XHCI ||

		 pdev->device == PCI_DEVICE_ID_INTEL_BROXTON_B_XHCI ||

		 pdev->device == PCI_DEVICE_ID_INTEL_BROXTON_B_XHCI ||

		 pdev->device == PCI_DEVICE_ID_INTEL_APL_XHCI ||

		 pdev->device == PCI_DEVICE_ID_INTEL_APL_XHCI ||

		 pdev->device == PCI_DEVICE_ID_INTEL_DNV_XHCI)) {

		 pdev->device == PCI_DEVICE_ID_INTEL_DNV_XHCI ||

		 pdev->device == PCI_DEVICE_ID_INTEL_CML_XHCI)) {

		xhci->quirks |= XHCI_PME_STUCK_QUIRK;

		xhci->quirks |= XHCI_PME_STUCK_QUIRK;

	}

	}

	if (pdev->vendor == PCI_VENDOR_ID_INTEL &&

	if (pdev->vendor == PCI_VENDOR_ID_INTEL &&