From: Greg Kroah-Hartman Date: Wed, 15 Mar 2023 10:51:28 +0000 (+0100) Subject: drop dwc3 patches from 5.10 and 5.4 as they are not needed there. X-Git-Tag: v4.14.310~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=20bd8dfd1641cac98e625e98553ad8beae0d9992;p=thirdparty%2Fkernel%2Fstable-queue.git drop dwc3 patches from 5.10 and 5.4 as they are not needed there. --- diff --git a/queue-5.10/series b/queue-5.10/series index 1f79337b6bc..be9b14391e2 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -17,11 +17,6 @@ irqdomain-refactor-__irq_domain_alloc_irqs.patch irqdomain-fix-mapping-creation-race.patch irqdomain-change-the-type-of-size-in-__irq_domain_ad.patch irqdomain-fix-domain-registration-race.patch -usb-dwc3-pci-register-a-software-node-for-the-dwc3-p.patch -usb-dwc3-pci-id-for-tiger-lake-cpu.patch -usb-dwc3-pci-add-support-for-the-intel-raptor-lake-s.patch -usb-dwc3-pci-add-support-for-the-intel-meteor-lake-p.patch -usb-dwc3-pci-add-support-for-the-intel-meteor-lake-m.patch riscv-using-patchable_function_entry-instead-of-mcou.patch riscv-ftrace-remove-wasted-nops-for-riscv_isa_c.patch riscv-ftrace-reduce-the-detour-code-size-to-half.patch diff --git a/queue-5.10/usb-dwc3-pci-add-support-for-the-intel-meteor-lake-m.patch b/queue-5.10/usb-dwc3-pci-add-support-for-the-intel-meteor-lake-m.patch deleted file mode 100644 index 37c43f7df04..00000000000 --- a/queue-5.10/usb-dwc3-pci-add-support-for-the-intel-meteor-lake-m.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 47186e711c93ccd622578fa4d86cc7499dfb1aff Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 15 Feb 2023 15:27:11 +0200 -Subject: usb: dwc3: pci: add support for the Intel Meteor Lake-M - -From: Heikki Krogerus - -[ Upstream commit 8e5248c3a8778f3e394e9a19195bc7a48f567ca2 ] - -This patch adds the necessary PCI IDs for Intel Meteor Lake-M -devices. - -Signed-off-by: Heikki Krogerus -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/20230215132711.35668-1-heikki.krogerus@linux.intel.com -Signed-off-by: Greg Kroah-Hartman -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 57f4b068cf29b..054429e9b7152 100644 ---- a/drivers/usb/dwc3/dwc3-pci.c -+++ b/drivers/usb/dwc3/dwc3-pci.c -@@ -42,6 +42,7 @@ - #define PCI_DEVICE_ID_INTEL_JSP 0x4dee - #define PCI_DEVICE_ID_INTEL_ADLS 0x7ae1 - #define PCI_DEVICE_ID_INTEL_RPLS 0x7a61 -+#define PCI_DEVICE_ID_INTEL_MTLM 0x7eb1 - #define PCI_DEVICE_ID_INTEL_MTLP 0x7ec1 - #define PCI_DEVICE_ID_INTEL_MTL 0x7e7e - #define PCI_DEVICE_ID_INTEL_TGL 0x9a15 -@@ -394,6 +395,9 @@ static const struct pci_device_id dwc3_pci_id_table[] = { - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_RPLS), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - -+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MTLM), -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, -+ - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MTLP), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - --- -2.39.2 - diff --git a/queue-5.10/usb-dwc3-pci-add-support-for-the-intel-meteor-lake-p.patch b/queue-5.10/usb-dwc3-pci-add-support-for-the-intel-meteor-lake-p.patch deleted file mode 100644 index eaacc7886ba..00000000000 --- a/queue-5.10/usb-dwc3-pci-add-support-for-the-intel-meteor-lake-p.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 00f613c8f462bab5d623365c67b5ca8defeca5e8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 25 Apr 2022 13:35:18 +0300 -Subject: usb: dwc3: pci: add support for the Intel Meteor Lake-P - -From: Heikki Krogerus - -[ Upstream commit 973e0f7a847ef13ade840d4c30729ce329a66895 ] - -This patch adds the necessary PCI IDs for Intel Meteor Lake-P -devices. - -Signed-off-by: Heikki Krogerus -Cc: stable -Link: https://lore.kernel.org/r/20220425103518.44028-1-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 | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c -index cc97cbb67e5f4..57f4b068cf29b 100644 ---- a/drivers/usb/dwc3/dwc3-pci.c -+++ b/drivers/usb/dwc3/dwc3-pci.c -@@ -42,6 +42,8 @@ - #define PCI_DEVICE_ID_INTEL_JSP 0x4dee - #define PCI_DEVICE_ID_INTEL_ADLS 0x7ae1 - #define PCI_DEVICE_ID_INTEL_RPLS 0x7a61 -+#define PCI_DEVICE_ID_INTEL_MTLP 0x7ec1 -+#define PCI_DEVICE_ID_INTEL_MTL 0x7e7e - #define PCI_DEVICE_ID_INTEL_TGL 0x9a15 - - #define PCI_INTEL_BXT_DSM_GUID "732b85d5-b7a7-4a1b-9ba0-4bbd00ffd511" -@@ -392,6 +394,12 @@ static const struct pci_device_id dwc3_pci_id_table[] = { - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_RPLS), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - -+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MTLP), -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, -+ -+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MTL), -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, -+ - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGL), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - --- -2.39.2 - diff --git a/queue-5.10/usb-dwc3-pci-add-support-for-the-intel-raptor-lake-s.patch b/queue-5.10/usb-dwc3-pci-add-support-for-the-intel-raptor-lake-s.patch deleted file mode 100644 index 7e30dc358f5..00000000000 --- a/queue-5.10/usb-dwc3-pci-add-support-for-the-intel-raptor-lake-s.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5dbce0765acfe614da7dd457dd1eff8e896594e2 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 14 Feb 2022 17:19:48 +0300 -Subject: usb: dwc3: pci: add support for the Intel Raptor Lake-S - -From: Heikki Krogerus - -[ Upstream commit 038438a25c45d5ac996e95a22fa9e76ff3d1f8c7 ] - -This patch adds the necessary PCI ID for Intel Raptor Lake-S -devices. - -Signed-off-by: Heikki Krogerus -Link: https://lore.kernel.org/r/20220214141948.18637-1-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 114d02ebf128a..cc97cbb67e5f4 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_RPLS 0x7a61 - #define PCI_DEVICE_ID_INTEL_TGL 0x9a15 - - #define PCI_INTEL_BXT_DSM_GUID "732b85d5-b7a7-4a1b-9ba0-4bbd00ffd511" -@@ -388,6 +389,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_swnode, }, - -+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_RPLS), -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, -+ - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGL), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - --- -2.39.2 - diff --git a/queue-5.10/usb-dwc3-pci-id-for-tiger-lake-cpu.patch b/queue-5.10/usb-dwc3-pci-id-for-tiger-lake-cpu.patch deleted file mode 100644 index 7642637d4cf..00000000000 --- a/queue-5.10/usb-dwc3-pci-id-for-tiger-lake-cpu.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 1ca135a6080ac8408989feb5e07d261595eba264 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 70cdb59c04c81..114d02ebf128a 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 -@@ -387,6 +388,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_swnode, }, - -+ { 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_swnode, }, - { } /* Terminating Entry */ --- -2.39.2 - diff --git a/queue-5.10/usb-dwc3-pci-register-a-software-node-for-the-dwc3-p.patch b/queue-5.10/usb-dwc3-pci-register-a-software-node-for-the-dwc3-p.patch deleted file mode 100644 index b80321879d3..00000000000 --- a/queue-5.10/usb-dwc3-pci-register-a-software-node-for-the-dwc3-p.patch +++ /dev/null @@ -1,173 +0,0 @@ -From 7772a4337dc5115df15e37110e5c52e0db82c0da Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 15 Jan 2021 12:49:12 +0300 -Subject: usb: dwc3: pci: Register a software node for the dwc3 platform device - -From: Heikki Krogerus - -[ Upstream commit e492ce9bcaa1c9661cd3dd6cff0eedf2fa640f31 ] - -By registering the software node directly instead of just -the properties in it, the driver can take advantage of also -the other features the software nodes have. - -Acked-by: Felipe Balbi -Signed-off-by: Heikki Krogerus -Link: https://lore.kernel.org/r/20210115094914.88401-3-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 | 61 ++++++++++++++++++++++--------------- - 1 file changed, 37 insertions(+), 24 deletions(-) - -diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c -index a5a8c5712bce4..70cdb59c04c81 100644 ---- a/drivers/usb/dwc3/dwc3-pci.c -+++ b/drivers/usb/dwc3/dwc3-pci.c -@@ -145,6 +145,18 @@ static const struct property_entry dwc3_pci_amd_properties[] = { - {} - }; - -+static const struct software_node dwc3_pci_intel_swnode = { -+ .properties = dwc3_pci_intel_properties, -+}; -+ -+static const struct software_node dwc3_pci_intel_mrfld_swnode = { -+ .properties = dwc3_pci_mrfld_properties, -+}; -+ -+static const struct software_node dwc3_pci_amd_swnode = { -+ .properties = dwc3_pci_amd_properties, -+}; -+ - static int dwc3_pci_quirks(struct dwc3_pci *dwc) - { - struct pci_dev *pdev = dwc->pci; -@@ -225,7 +237,6 @@ static void dwc3_pci_resume_work(struct work_struct *work) - - static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) - { -- struct property_entry *p = (struct property_entry *)id->driver_data; - struct dwc3_pci *dwc; - struct resource res[2]; - int ret; -@@ -268,7 +279,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) - dwc->dwc3->dev.parent = dev; - ACPI_COMPANION_SET(&dwc->dwc3->dev, ACPI_COMPANION(dev)); - -- ret = platform_device_add_properties(dwc->dwc3, p); -+ ret = device_add_software_node(&dwc->dwc3->dev, (void *)id->driver_data); - if (ret < 0) - goto err; - -@@ -291,6 +302,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) - - return 0; - err: -+ device_remove_software_node(&dwc->dwc3->dev); - platform_device_put(dwc->dwc3); - return ret; - } -@@ -307,75 +319,76 @@ static void dwc3_pci_remove(struct pci_dev *pci) - #endif - device_init_wakeup(&pci->dev, false); - pm_runtime_get(&pci->dev); -+ device_remove_software_node(&dwc->dwc3->dev); - platform_device_unregister(dwc->dwc3); - } - - static const struct pci_device_id dwc3_pci_id_table[] = { - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_BSW), -- (kernel_ulong_t) &dwc3_pci_intel_properties }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_BYT), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MRFLD), -- (kernel_ulong_t) &dwc3_pci_mrfld_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_mrfld_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CMLLP), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CMLH), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_SPTLP), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_SPTH), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_BXT), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_BXT_M), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_APL), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_KBP), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_GLK), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CNPLP), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CNPH), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CNPV), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICLLP), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_EHLLP), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGPLP), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGPH), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_JSP), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ADLS), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_NL_USB), -- (kernel_ulong_t) &dwc3_pci_amd_properties, }, -+ (kernel_ulong_t) &dwc3_pci_amd_swnode, }, - { } /* Terminating Entry */ - }; - MODULE_DEVICE_TABLE(pci, dwc3_pci_id_table); --- -2.39.2 - diff --git a/queue-5.4/series b/queue-5.4/series index c25fdac37cd..344e01fea96 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -21,12 +21,6 @@ ipmi-ssif-increase-the-message-retry-time.patch ipmi-ssif-add-a-timer-between-request-retries.patch irqdomain-change-the-type-of-size-in-__irq_domain_ad.patch irqdomain-fix-domain-registration-race.patch -software-node-introduce-device_add_software_node.patch -usb-dwc3-pci-register-a-software-node-for-the-dwc3-p.patch -usb-dwc3-pci-id-for-tiger-lake-cpu.patch -usb-dwc3-pci-add-support-for-the-intel-raptor-lake-s.patch -usb-dwc3-pci-add-support-for-the-intel-meteor-lake-p.patch -usb-dwc3-pci-add-support-for-the-intel-meteor-lake-m.patch riscv-using-patchable_function_entry-instead-of-mcou.patch riscv-ftrace-remove-wasted-nops-for-riscv_isa_c.patch iommu-vt-d-fix-pasid-directory-pointer-coherency.patch diff --git a/queue-5.4/usb-dwc3-pci-add-support-for-the-intel-meteor-lake-m.patch b/queue-5.4/usb-dwc3-pci-add-support-for-the-intel-meteor-lake-m.patch deleted file mode 100644 index 49dcd6d043c..00000000000 --- a/queue-5.4/usb-dwc3-pci-add-support-for-the-intel-meteor-lake-m.patch +++ /dev/null @@ -1,46 +0,0 @@ -From c38ecec7686b355a0a47e3d7dd7572130eaa98ad Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 15 Feb 2023 15:27:11 +0200 -Subject: usb: dwc3: pci: add support for the Intel Meteor Lake-M - -From: Heikki Krogerus - -[ Upstream commit 8e5248c3a8778f3e394e9a19195bc7a48f567ca2 ] - -This patch adds the necessary PCI IDs for Intel Meteor Lake-M -devices. - -Signed-off-by: Heikki Krogerus -Cc: stable@vger.kernel.org -Link: https://lore.kernel.org/r/20230215132711.35668-1-heikki.krogerus@linux.intel.com -Signed-off-by: Greg Kroah-Hartman -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 46d7c3904fe08..6eb39631a9e2e 100644 ---- a/drivers/usb/dwc3/dwc3-pci.c -+++ b/drivers/usb/dwc3/dwc3-pci.c -@@ -42,6 +42,7 @@ - #define PCI_DEVICE_ID_INTEL_JSP 0x4dee - #define PCI_DEVICE_ID_INTEL_ADLS 0x7ae1 - #define PCI_DEVICE_ID_INTEL_RPLS 0x7a61 -+#define PCI_DEVICE_ID_INTEL_MTLM 0x7eb1 - #define PCI_DEVICE_ID_INTEL_MTLP 0x7ec1 - #define PCI_DEVICE_ID_INTEL_MTL 0x7e7e - #define PCI_DEVICE_ID_INTEL_TGL 0x9a15 -@@ -392,6 +393,9 @@ static const struct pci_device_id dwc3_pci_id_table[] = { - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_RPLS), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - -+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MTLM), -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, -+ - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MTLP), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - --- -2.39.2 - diff --git a/queue-5.4/usb-dwc3-pci-add-support-for-the-intel-meteor-lake-p.patch b/queue-5.4/usb-dwc3-pci-add-support-for-the-intel-meteor-lake-p.patch deleted file mode 100644 index 15e7de58469..00000000000 --- a/queue-5.4/usb-dwc3-pci-add-support-for-the-intel-meteor-lake-p.patch +++ /dev/null @@ -1,51 +0,0 @@ -From cd015705af78189bf5efa666c6694f55f83efbb2 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 25 Apr 2022 13:35:18 +0300 -Subject: usb: dwc3: pci: add support for the Intel Meteor Lake-P - -From: Heikki Krogerus - -[ Upstream commit 973e0f7a847ef13ade840d4c30729ce329a66895 ] - -This patch adds the necessary PCI IDs for Intel Meteor Lake-P -devices. - -Signed-off-by: Heikki Krogerus -Cc: stable -Link: https://lore.kernel.org/r/20220425103518.44028-1-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 | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c -index 291f73fdd4be0..46d7c3904fe08 100644 ---- a/drivers/usb/dwc3/dwc3-pci.c -+++ b/drivers/usb/dwc3/dwc3-pci.c -@@ -42,6 +42,8 @@ - #define PCI_DEVICE_ID_INTEL_JSP 0x4dee - #define PCI_DEVICE_ID_INTEL_ADLS 0x7ae1 - #define PCI_DEVICE_ID_INTEL_RPLS 0x7a61 -+#define PCI_DEVICE_ID_INTEL_MTLP 0x7ec1 -+#define PCI_DEVICE_ID_INTEL_MTL 0x7e7e - #define PCI_DEVICE_ID_INTEL_TGL 0x9a15 - - #define PCI_INTEL_BXT_DSM_GUID "732b85d5-b7a7-4a1b-9ba0-4bbd00ffd511" -@@ -390,6 +392,12 @@ static const struct pci_device_id dwc3_pci_id_table[] = { - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_RPLS), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - -+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MTLP), -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, -+ -+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MTL), -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, -+ - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGL), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - --- -2.39.2 - diff --git a/queue-5.4/usb-dwc3-pci-add-support-for-the-intel-raptor-lake-s.patch b/queue-5.4/usb-dwc3-pci-add-support-for-the-intel-raptor-lake-s.patch deleted file mode 100644 index f497c4b3a42..00000000000 --- a/queue-5.4/usb-dwc3-pci-add-support-for-the-intel-raptor-lake-s.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ca22d3b19801363a988d2a3d34e808d6bbab9baf Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 14 Feb 2022 17:19:48 +0300 -Subject: usb: dwc3: pci: add support for the Intel Raptor Lake-S - -From: Heikki Krogerus - -[ Upstream commit 038438a25c45d5ac996e95a22fa9e76ff3d1f8c7 ] - -This patch adds the necessary PCI ID for Intel Raptor Lake-S -devices. - -Signed-off-by: Heikki Krogerus -Link: https://lore.kernel.org/r/20220214141948.18637-1-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 a1b135153137a..291f73fdd4be0 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_RPLS 0x7a61 - #define PCI_DEVICE_ID_INTEL_TGL 0x9a15 - - #define PCI_INTEL_BXT_DSM_GUID "732b85d5-b7a7-4a1b-9ba0-4bbd00ffd511" -@@ -386,6 +387,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_swnode, }, - -+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_RPLS), -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, -+ - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGL), - (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - --- -2.39.2 - diff --git a/queue-5.4/usb-dwc3-pci-id-for-tiger-lake-cpu.patch b/queue-5.4/usb-dwc3-pci-id-for-tiger-lake-cpu.patch deleted file mode 100644 index 7c546099307..00000000000 --- a/queue-5.4/usb-dwc3-pci-id-for-tiger-lake-cpu.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 342b88e45896b874876d56581839f4ebb3ae1cfe 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 a4439ea3cebaf..a1b135153137a 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 -@@ -385,6 +386,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_swnode, }, - -+ { 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_swnode, }, - { } /* Terminating Entry */ --- -2.39.2 - diff --git a/queue-5.4/usb-dwc3-pci-register-a-software-node-for-the-dwc3-p.patch b/queue-5.4/usb-dwc3-pci-register-a-software-node-for-the-dwc3-p.patch deleted file mode 100644 index 1820cc48dcf..00000000000 --- a/queue-5.4/usb-dwc3-pci-register-a-software-node-for-the-dwc3-p.patch +++ /dev/null @@ -1,173 +0,0 @@ -From 6b165f987752cbde325d799327a98f6b3c150ced Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 15 Jan 2021 12:49:12 +0300 -Subject: usb: dwc3: pci: Register a software node for the dwc3 platform device - -From: Heikki Krogerus - -[ Upstream commit e492ce9bcaa1c9661cd3dd6cff0eedf2fa640f31 ] - -By registering the software node directly instead of just -the properties in it, the driver can take advantage of also -the other features the software nodes have. - -Acked-by: Felipe Balbi -Signed-off-by: Heikki Krogerus -Link: https://lore.kernel.org/r/20210115094914.88401-3-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 | 61 ++++++++++++++++++++++--------------- - 1 file changed, 37 insertions(+), 24 deletions(-) - -diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c -index 955bf820f4102..a4439ea3cebaf 100644 ---- a/drivers/usb/dwc3/dwc3-pci.c -+++ b/drivers/usb/dwc3/dwc3-pci.c -@@ -143,6 +143,18 @@ static const struct property_entry dwc3_pci_amd_properties[] = { - {} - }; - -+static const struct software_node dwc3_pci_intel_swnode = { -+ .properties = dwc3_pci_intel_properties, -+}; -+ -+static const struct software_node dwc3_pci_intel_mrfld_swnode = { -+ .properties = dwc3_pci_mrfld_properties, -+}; -+ -+static const struct software_node dwc3_pci_amd_swnode = { -+ .properties = dwc3_pci_amd_properties, -+}; -+ - static int dwc3_pci_quirks(struct dwc3_pci *dwc) - { - struct pci_dev *pdev = dwc->pci; -@@ -223,7 +235,6 @@ static void dwc3_pci_resume_work(struct work_struct *work) - - static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) - { -- struct property_entry *p = (struct property_entry *)id->driver_data; - struct dwc3_pci *dwc; - struct resource res[2]; - int ret; -@@ -266,7 +277,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) - dwc->dwc3->dev.parent = dev; - ACPI_COMPANION_SET(&dwc->dwc3->dev, ACPI_COMPANION(dev)); - -- ret = platform_device_add_properties(dwc->dwc3, p); -+ ret = device_add_software_node(&dwc->dwc3->dev, (void *)id->driver_data); - if (ret < 0) - goto err; - -@@ -289,6 +300,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) - - return 0; - err: -+ device_remove_software_node(&dwc->dwc3->dev); - platform_device_put(dwc->dwc3); - return ret; - } -@@ -305,75 +317,76 @@ static void dwc3_pci_remove(struct pci_dev *pci) - #endif - device_init_wakeup(&pci->dev, false); - pm_runtime_get(&pci->dev); -+ device_remove_software_node(&dwc->dwc3->dev); - platform_device_unregister(dwc->dwc3); - } - - static const struct pci_device_id dwc3_pci_id_table[] = { - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_BSW), -- (kernel_ulong_t) &dwc3_pci_intel_properties }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_BYT), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MRFLD), -- (kernel_ulong_t) &dwc3_pci_mrfld_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_mrfld_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CMLLP), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CMLH), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_SPTLP), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_SPTH), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_BXT), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_BXT_M), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_APL), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_KBP), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_GLK), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CNPLP), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CNPH), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CNPV), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICLLP), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_EHLLP), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGPLP), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGPH), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_JSP), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ADLS), -- (kernel_ulong_t) &dwc3_pci_intel_properties, }, -+ (kernel_ulong_t) &dwc3_pci_intel_swnode, }, - - { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_NL_USB), -- (kernel_ulong_t) &dwc3_pci_amd_properties, }, -+ (kernel_ulong_t) &dwc3_pci_amd_swnode, }, - { } /* Terminating Entry */ - }; - MODULE_DEVICE_TABLE(pci, dwc3_pci_id_table); --- -2.39.2 -