From: Greg Kroah-Hartman Date: Fri, 12 Nov 2021 16:24:41 +0000 (+0100) Subject: drop queue-4.14/usb-xhci-enable-runtime-pm-by-default-on-amd-yellow-carp-platform... X-Git-Tag: v5.4.160~176 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a43aa19b3ff60f75bc88e2ebf2f13f94664f7d24;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.14/usb-xhci-enable-runtime-pm-by-default-on-amd-yellow-carp-platform.patch --- diff --git a/queue-4.14/series b/queue-4.14/series index ab7138b0e5c..091fe778cd2 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -1,2 +1 @@ xhci-fix-usb-3.1-enumeration-issues-by-increasing-roothub-power-on-good-delay.patch -usb-xhci-enable-runtime-pm-by-default-on-amd-yellow-carp-platform.patch diff --git a/queue-4.14/usb-xhci-enable-runtime-pm-by-default-on-amd-yellow-carp-platform.patch b/queue-4.14/usb-xhci-enable-runtime-pm-by-default-on-amd-yellow-carp-platform.patch deleted file mode 100644 index 0db0da1466f..00000000000 --- a/queue-4.14/usb-xhci-enable-runtime-pm-by-default-on-amd-yellow-carp-platform.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 660a92a59b9e831a0407e41ff62875656d30006e Mon Sep 17 00:00:00 2001 -From: Nehal Bakulchandra Shah -Date: Thu, 14 Oct 2021 15:12:00 +0300 -Subject: usb: xhci: Enable runtime-pm by default on AMD Yellow Carp platform - -From: Nehal Bakulchandra Shah - -commit 660a92a59b9e831a0407e41ff62875656d30006e upstream. - -AMD's Yellow Carp platform supports runtime power management for -XHCI Controllers, so enable the same by default for all XHCI Controllers. - -[ regrouped and aligned the PCI_DEVICE_ID definitions -Mathias] - -Cc: stable -Reviewed-by: Shyam Sundar S K -Reviewed-by: Mario Limonciello -Reviewed-by: Basavaraj Natikar -Signed-off-by: Nehal Bakulchandra Shah -Signed-off-by: Mathias Nyman -Link: https://lore.kernel.org/r/20211014121200.75433-2-mathias.nyman@linux.intel.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/host/xhci-pci.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - ---- a/drivers/usb/host/xhci-pci.c -+++ b/drivers/usb/host/xhci-pci.c -@@ -60,6 +60,13 @@ - #define PCI_DEVICE_ID_AMD_PROMONTORYA_3 0x43ba - #define PCI_DEVICE_ID_AMD_PROMONTORYA_2 0x43bb - #define PCI_DEVICE_ID_AMD_PROMONTORYA_1 0x43bc -+#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_1 0x161a -+#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_2 0x161b -+#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_3 0x161d -+#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_4 0x161e -+#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_5 0x15d6 -+#define PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_6 0x15d7 -+ - #define PCI_DEVICE_ID_ASMEDIA_1042_XHCI 0x1042 - #define PCI_DEVICE_ID_ASMEDIA_1042A_XHCI 0x1142 - #define PCI_DEVICE_ID_ASMEDIA_1142_XHCI 0x1242 -@@ -261,6 +268,15 @@ static void xhci_pci_quirks(struct devic - pdev->device == 0x9026) - xhci->quirks |= XHCI_RESET_PLL_ON_DISCONNECT; - -+ if (pdev->vendor == PCI_VENDOR_ID_AMD && -+ (pdev->device == PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_1 || -+ pdev->device == PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_2 || -+ pdev->device == PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_3 || -+ pdev->device == PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_4 || -+ pdev->device == PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_5 || -+ pdev->device == PCI_DEVICE_ID_AMD_YELLOW_CARP_XHCI_6)) -+ xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW; -+ - if (xhci->quirks & XHCI_RESET_ON_RESUME) - xhci_dbg_trace(xhci, trace_xhci_dbg_quirks, - "QUIRK: Resetting on resume");