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

queue-4.19/drm-amdgpu-gfx9-disable-gfxoff-when-reading-rlc-clock.patch [deleted file]
queue-4.19/series
queue-4.19/xhci-apply-xhci_pme_stuck_quirk-to-intel-comet-lake-platforms.patch [new file with mode: 0644]

diff --git a/queue-4.19/drm-amdgpu-gfx9-disable-gfxoff-when-reading-rlc-clock.patch b/queue-4.19/drm-amdgpu-gfx9-disable-gfxoff-when-reading-rlc-clock.patch
deleted file mode 100644 (file)
index 77f2cc8..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From 120cf959308e1bda984e40a9edd25ee2d6262efd Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Wed, 12 Feb 2020 08:51:29 -0500
-Subject: drm/amdgpu/gfx9: disable gfxoff when reading rlc clock
-
-From: Alex Deucher <alexander.deucher@amd.com>
-
-commit 120cf959308e1bda984e40a9edd25ee2d6262efd upstream.
-
-Otherwise we readback all ones.  Fixes rlc counter
-readback while gfxoff is active.
-
-Reviewed-by: Xiaojie Yuan <xiaojie.yuan@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
-@@ -3376,11 +3376,13 @@ static uint64_t gfx_v9_0_get_gpu_clock_c
- {
-       uint64_t clock;
-+      amdgpu_gfx_off_ctrl(adev, false);
-       mutex_lock(&adev->gfx.gpu_clock_mutex);
-       WREG32_SOC15(GC, 0, mmRLC_CAPTURE_GPU_CLOCK_COUNT, 1);
-       clock = (uint64_t)RREG32_SOC15(GC, 0, mmRLC_GPU_CLOCK_COUNT_LSB) |
-               ((uint64_t)RREG32_SOC15(GC, 0, mmRLC_GPU_CLOCK_COUNT_MSB) << 32ULL);
-       mutex_unlock(&adev->gfx.gpu_clock_mutex);
-+      amdgpu_gfx_off_ctrl(adev, true);
-       return clock;
- }
index fc5635fb01a62c5bbf9e318dffac1329449b24a7..9ac415da24ba85186343e7827d209e552dde7beb 100644 (file)
@@ -48,4 +48,4 @@ nvme-multipath-fix-memory-leak-with-ana_log_buf.patch
 genirq-irqdomain-make-sure-all-irq-domain-flags-are-distinct.patch
 mm-vmscan.c-don-t-round-up-scan-size-for-online-memory-cgroup.patch
 drm-amdgpu-soc15-fix-xclk-for-raven.patch
-drm-amdgpu-gfx9-disable-gfxoff-when-reading-rlc-clock.patch
+xhci-apply-xhci_pme_stuck_quirk-to-intel-comet-lake-platforms.patch
diff --git a/queue-4.19/xhci-apply-xhci_pme_stuck_quirk-to-intel-comet-lake-platforms.patch b/queue-4.19/xhci-apply-xhci_pme_stuck_quirk-to-intel-comet-lake-platforms.patch
new file mode 100644 (file)
index 0000000..e96112b
--- /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
+@@ -41,6 +41,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
+ #define PCI_DEVICE_ID_AMD_PROMONTORYA_4                       0x43b9
+ #define PCI_DEVICE_ID_AMD_PROMONTORYA_3                       0x43ba
+@@ -179,7 +180,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 &&