From: Greg Kroah-Hartman Date: Wed, 26 Feb 2020 17:30:10 +0000 (+0100) Subject: 4.4-stable patches X-Git-Tag: v4.4.215~59 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c063862c374265967e63029605de41bdb35d541c;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: xhci-apply-xhci_pme_stuck_quirk-to-intel-comet-lake-platforms.patch --- diff --git a/queue-4.4/series b/queue-4.4/series index b8fec0182e0..cddb7e88e15 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -91,3 +91,4 @@ staging-rtl8188eu-fix-potential-overuse-of-kernel-memory.patch x86-mce-amd-fix-kobject-lifetime.patch tty-serial-imx-setup-the-correct-sg-entry-for-tx-dma.patch revert-ipc-sem-remove-uneeded-sem_undo_list-lock-usage-in-exit_sem.patch +xhci-apply-xhci_pme_stuck_quirk-to-intel-comet-lake-platforms.patch diff --git a/queue-4.4/xhci-apply-xhci_pme_stuck_quirk-to-intel-comet-lake-platforms.patch b/queue-4.4/xhci-apply-xhci_pme_stuck_quirk-to-intel-comet-lake-platforms.patch new file mode 100644 index 00000000000..b76f653a273 --- /dev/null +++ b/queue-4.4/xhci-apply-xhci_pme_stuck_quirk-to-intel-comet-lake-platforms.patch @@ -0,0 +1,41 @@ +From a3ae87dce3a5abe0b57c811bab02b2564b574106 Mon Sep 17 00:00:00 2001 +From: Mathias Nyman +Date: Mon, 10 Feb 2020 15:45:53 +0200 +Subject: xhci: apply XHCI_PME_STUCK_QUIRK to Intel Comet Lake platforms + +From: Mathias Nyman + +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: Mathias Nyman +Link: https://lore.kernel.org/r/20200210134553.9144-5-mathias.nyman@linux.intel.com +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/host/xhci-pci.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/usb/host/xhci-pci.c ++++ b/drivers/usb/host/xhci-pci.c +@@ -53,6 +53,7 @@ + #define PCI_DEVICE_ID_INTEL_BROXTON_B_XHCI 0x1aa8 + #define PCI_DEVICE_ID_INTEL_APL_XHCI 0x5aa8 + #define PCI_DEVICE_ID_INTEL_DNV_XHCI 0x19d0 ++#define PCI_DEVICE_ID_INTEL_CML_XHCI 0xa3af + + static const char hcd_name[] = "xhci_hcd"; + +@@ -169,7 +170,8 @@ static void xhci_pci_quirks(struct devic + pdev->device == PCI_DEVICE_ID_INTEL_BROXTON_M_XHCI || + pdev->device == PCI_DEVICE_ID_INTEL_BROXTON_B_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; + } + if (pdev->vendor == PCI_VENDOR_ID_INTEL &&