From: Greg Kroah-Hartman Date: Wed, 26 Feb 2020 17:31:10 +0000 (+0100) Subject: 4.19-stable patches X-Git-Tag: v4.4.215~56 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c39159cf283c62d7d2fef63330e4e0a807ef6a86;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: xhci-apply-xhci_pme_stuck_quirk-to-intel-comet-lake-platforms.patch --- 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 index 77f2cc81e6c..00000000000 --- a/queue-4.19/drm-amdgpu-gfx9-disable-gfxoff-when-reading-rlc-clock.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 120cf959308e1bda984e40a9edd25ee2d6262efd Mon Sep 17 00:00:00 2001 -From: Alex Deucher -Date: Wed, 12 Feb 2020 08:51:29 -0500 -Subject: drm/amdgpu/gfx9: disable gfxoff when reading rlc clock - -From: Alex Deucher - -commit 120cf959308e1bda984e40a9edd25ee2d6262efd upstream. - -Otherwise we readback all ones. Fixes rlc counter -readback while gfxoff is active. - -Reviewed-by: Xiaojie Yuan -Signed-off-by: Alex Deucher -Cc: stable@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman - ---- - 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; - } - diff --git a/queue-4.19/series b/queue-4.19/series index fc5635fb01a..9ac415da24b 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -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 index 00000000000..e96112bb0b3 --- /dev/null +++ b/queue-4.19/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 +@@ -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 &&