From: Sasha Levin Date: Mon, 13 Mar 2023 12:19:00 +0000 (-0400) Subject: Drop usb-dwc3-pci-id-for-tiger-lake-cpu.patch from 4.19 X-Git-Tag: v4.14.310~86 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bfb6e770d161a34464ede490a8793748762cd56b;p=thirdparty%2Fkernel%2Fstable-queue.git Drop usb-dwc3-pci-id-for-tiger-lake-cpu.patch from 4.19 --- diff --git a/queue-4.19/series b/queue-4.19/series index 6bbfe3b3bd7..743532b0a7e 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -16,7 +16,6 @@ fs-dlm-add-union-in-dlm-header-for-lockspace-id.patch fs-dlm-fix-log-of-lowcomms-vs-midcomms.patch kvm-using-macros-instead-of-magic-values.patch kvm-x86-do-not-change-icr-on-write-to-apic_self_ipi.patch -usb-dwc3-pci-id-for-tiger-lake-cpu.patch riscv-using-patchable_function_entry-instead-of-mcou.patch arm-dts-exynos-fix-language-typo-and-indentation.patch riscv-ftrace-remove-wasted-nops-for-riscv_isa_c.patch diff --git a/queue-4.19/usb-dwc3-pci-id-for-tiger-lake-cpu.patch b/queue-4.19/usb-dwc3-pci-id-for-tiger-lake-cpu.patch deleted file mode 100644 index 41b27a72a35..00000000000 --- a/queue-4.19/usb-dwc3-pci-id-for-tiger-lake-cpu.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 5f0936918321976a2b0d659c1b1fded12391b931 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 15 Jan 2021 12:49:13 +0300 -Subject: usb: dwc3: pci: ID for Tiger Lake CPU - -From: Heikki Krogerus - -[ Upstream commit 73203bde3a95a48f27b2454dc6b955280c641afe ] - -Tiger Lake SOC (the versions of it that have integrated USB4 -controller) may have two DWC3 controllers. One is part of -the PCH (Platform Controller Hub, i.e. the chipset) as -usual, and the other is inside the actual CPU block. - -On all Intel platforms that have the two separate DWC3 -controllers, the one inside the CPU handles USB3 and only -USB3 traffic, while the PCH version handles USB2 and USB2 -alone. The reason for splitting the two busses like this is -to allow easy USB3 tunneling over USB4 connections. As USB2 -is not tunneled over USB4, it has dedicated USB controllers -(both xHCI and DWC3). - -Acked-by: Felipe Balbi -Signed-off-by: Heikki Krogerus -Link: https://lore.kernel.org/r/20210115094914.88401-4-heikki.krogerus@linux.intel.com -Signed-off-by: Greg Kroah-Hartman -Stable-dep-of: 8e5248c3a877 ("usb: dwc3: pci: add support for the Intel Meteor Lake-M") -Signed-off-by: Sasha Levin ---- - drivers/usb/dwc3/dwc3-pci.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c -index 955bf820f4102..30bfbeb331ad4 100644 ---- a/drivers/usb/dwc3/dwc3-pci.c -+++ b/drivers/usb/dwc3/dwc3-pci.c -@@ -41,6 +41,7 @@ - #define PCI_DEVICE_ID_INTEL_TGPH 0x43ee - #define PCI_DEVICE_ID_INTEL_JSP 0x4dee - #define PCI_DEVICE_ID_INTEL_ADLS 0x7ae1 -+#define PCI_DEVICE_ID_INTEL_TGL 0x9a15 - - #define PCI_INTEL_BXT_DSM_GUID "732b85d5-b7a7-4a1b-9ba0-4bbd00ffd511" - #define PCI_INTEL_BXT_FUNC_PMU_PWR 4 -@@ -372,6 +373,9 @@ static const struct pci_device_id dwc3_pci_id_table[] = { - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ADLS), - (kernel_ulong_t) &dwc3_pci_intel_properties, }, - -+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGL), -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, -+ - { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_NL_USB), - (kernel_ulong_t) &dwc3_pci_amd_properties, }, - { } /* Terminating Entry */ --- -2.39.2 -