]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Feb 2020 17:30:10 +0000 (18:30 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Feb 2020 17:30:10 +0000 (18:30 +0100)
added patches:
xhci-apply-xhci_pme_stuck_quirk-to-intel-comet-lake-platforms.patch

queue-4.4/series
queue-4.4/xhci-apply-xhci_pme_stuck_quirk-to-intel-comet-lake-platforms.patch [new file with mode: 0644]

index b8fec0182e0815a1939a90e090b29072f426d301..cddb7e88e1513b72cb71ab152e5d1f768369986b 100644 (file)
@@ -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 (file)
index 0000000..b76f653
--- /dev/null
@@ -0,0 +1,41 @@
+From a3ae87dce3a5abe0b57c811bab02b2564b574106 Mon Sep 17 00:00:00 2001
+From: Mathias Nyman <mathias.nyman@linux.intel.com>
+Date: Mon, 10 Feb 2020 15:45:53 +0200
+Subject: xhci: apply XHCI_PME_STUCK_QUIRK to Intel Comet Lake platforms
+
+From: Mathias Nyman <mathias.nyman@linux.intel.com>
+
+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 <mathias.nyman@linux.intel.com>
+Link: https://lore.kernel.org/r/20200210134553.9144-5-mathias.nyman@linux.intel.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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 &&