From: Greg Kroah-Hartman Date: Mon, 10 Apr 2023 09:10:02 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v5.15.107~49 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2693da89bb0831fd48ea6b072365b0224a34a538;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: usb-xhci-tegra-fix-sleep-in-atomic-call.patch xhci-also-avoid-the-xhci_zero_64b_regs-quirk-with-a-passthrough-iommu.patch --- diff --git a/queue-5.10/series b/queue-5.10/series index 6a90cdba59f..ed6a4de7ca6 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -16,3 +16,5 @@ net-ethernet-ti-am65-cpsw-fix-mdio-cleanup-in-probe.patch net-stmmac-fix-up-rx-flow-hash-indirection-table-whe.patch sunrpc-only-free-unix-grouplist-after-rcu-settles.patch nfsd-callback-request-does-not-use-correct-credentia.patch +usb-xhci-tegra-fix-sleep-in-atomic-call.patch +xhci-also-avoid-the-xhci_zero_64b_regs-quirk-with-a-passthrough-iommu.patch diff --git a/queue-5.10/usb-xhci-tegra-fix-sleep-in-atomic-call.patch b/queue-5.10/usb-xhci-tegra-fix-sleep-in-atomic-call.patch new file mode 100644 index 00000000000..bee99df413e --- /dev/null +++ b/queue-5.10/usb-xhci-tegra-fix-sleep-in-atomic-call.patch @@ -0,0 +1,76 @@ +From 4c7f9d2e413dc06a157c4e5dccde84aaf4655eb3 Mon Sep 17 00:00:00 2001 +From: Wayne Chang +Date: Mon, 27 Mar 2023 17:55:48 +0800 +Subject: usb: xhci: tegra: fix sleep in atomic call + +From: Wayne Chang + +commit 4c7f9d2e413dc06a157c4e5dccde84aaf4655eb3 upstream. + +When we set the dual-role port to Host mode, we observed the following +splat: +[ 167.057718] BUG: sleeping function called from invalid context at +include/linux/sched/mm.h:229 +[ 167.057872] Workqueue: events tegra_xusb_usb_phy_work +[ 167.057954] Call trace: +[ 167.057962] dump_backtrace+0x0/0x210 +[ 167.057996] show_stack+0x30/0x50 +[ 167.058020] dump_stack_lvl+0x64/0x84 +[ 167.058065] dump_stack+0x14/0x34 +[ 167.058100] __might_resched+0x144/0x180 +[ 167.058140] __might_sleep+0x64/0xd0 +[ 167.058171] slab_pre_alloc_hook.constprop.0+0xa8/0x110 +[ 167.058202] __kmalloc_track_caller+0x74/0x2b0 +[ 167.058233] kvasprintf+0xa4/0x190 +[ 167.058261] kasprintf+0x58/0x90 +[ 167.058285] tegra_xusb_find_port_node.isra.0+0x58/0xd0 +[ 167.058334] tegra_xusb_find_port+0x38/0xa0 +[ 167.058380] tegra_xusb_padctl_get_usb3_companion+0x38/0xd0 +[ 167.058430] tegra_xhci_id_notify+0x8c/0x1e0 +[ 167.058473] notifier_call_chain+0x88/0x100 +[ 167.058506] atomic_notifier_call_chain+0x44/0x70 +[ 167.058537] tegra_xusb_usb_phy_work+0x60/0xd0 +[ 167.058581] process_one_work+0x1dc/0x4c0 +[ 167.058618] worker_thread+0x54/0x410 +[ 167.058650] kthread+0x188/0x1b0 +[ 167.058672] ret_from_fork+0x10/0x20 + +The function tegra_xusb_padctl_get_usb3_companion eventually calls +tegra_xusb_find_port and this in turn calls kasprintf which might sleep +and so cannot be called from an atomic context. + +Fix this by moving the call to tegra_xusb_padctl_get_usb3_companion to +the tegra_xhci_id_work function where it is really needed. + +Fixes: f836e7843036 ("usb: xhci-tegra: Add OTG support") +Cc: stable@vger.kernel.org +Signed-off-by: Wayne Chang +Signed-off-by: Haotien Hsu +Link: https://lore.kernel.org/r/20230327095548.1599470-1-haotienh@nvidia.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/host/xhci-tegra.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/usb/host/xhci-tegra.c ++++ b/drivers/usb/host/xhci-tegra.c +@@ -1175,6 +1175,9 @@ static void tegra_xhci_id_work(struct wo + + mutex_unlock(&tegra->lock); + ++ tegra->otg_usb3_port = tegra_xusb_padctl_get_usb3_companion(tegra->padctl, ++ tegra->otg_usb2_port); ++ + if (tegra->host_mode) { + /* switch to host mode */ + if (tegra->otg_usb3_port >= 0) { +@@ -1243,9 +1246,6 @@ static int tegra_xhci_id_notify(struct n + } + + tegra->otg_usb2_port = tegra_xusb_get_usb2_port(tegra, usbphy); +- tegra->otg_usb3_port = tegra_xusb_padctl_get_usb3_companion( +- tegra->padctl, +- tegra->otg_usb2_port); + + tegra->host_mode = (usbphy->last_event == USB_EVENT_ID) ? true : false; + diff --git a/queue-5.10/xhci-also-avoid-the-xhci_zero_64b_regs-quirk-with-a-passthrough-iommu.patch b/queue-5.10/xhci-also-avoid-the-xhci_zero_64b_regs-quirk-with-a-passthrough-iommu.patch new file mode 100644 index 00000000000..ef00dab4ab0 --- /dev/null +++ b/queue-5.10/xhci-also-avoid-the-xhci_zero_64b_regs-quirk-with-a-passthrough-iommu.patch @@ -0,0 +1,56 @@ +From ecaa4902439298f6b0e29f47424a86b310a9ff4f Mon Sep 17 00:00:00 2001 +From: D Scott Phillips +Date: Thu, 30 Mar 2023 17:30:54 +0300 +Subject: xhci: also avoid the XHCI_ZERO_64B_REGS quirk with a passthrough iommu + +From: D Scott Phillips + +commit ecaa4902439298f6b0e29f47424a86b310a9ff4f upstream. + +Previously the quirk was skipped when no iommu was present. The same +rationale for skipping the quirk also applies in the iommu.passthrough=1 +case. + +Skip applying the XHCI_ZERO_64B_REGS quirk if the device's iommu domain is +passthrough. + +Fixes: 12de0a35c996 ("xhci: Add quirk to zero 64bit registers on Renesas PCIe controllers") +Cc: stable +Signed-off-by: D Scott Phillips +Acked-by: Marc Zyngier +Signed-off-by: Mathias Nyman +Link: https://lore.kernel.org/r/20230330143056.1390020-2-mathias.nyman@linux.intel.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/host/xhci.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/drivers/usb/host/xhci.c ++++ b/drivers/usb/host/xhci.c +@@ -9,6 +9,7 @@ + */ + + #include ++#include + #include + #include + #include +@@ -226,6 +227,7 @@ int xhci_reset(struct xhci_hcd *xhci, u6 + static void xhci_zero_64b_regs(struct xhci_hcd *xhci) + { + struct device *dev = xhci_to_hcd(xhci)->self.sysdev; ++ struct iommu_domain *domain; + int err, i; + u64 val; + u32 intrs; +@@ -244,7 +246,9 @@ static void xhci_zero_64b_regs(struct xh + * an iommu. Doing anything when there is no iommu is definitely + * unsafe... + */ +- if (!(xhci->quirks & XHCI_ZERO_64B_REGS) || !device_iommu_mapped(dev)) ++ domain = iommu_get_domain_for_dev(dev); ++ if (!(xhci->quirks & XHCI_ZERO_64B_REGS) || !domain || ++ domain->type == IOMMU_DOMAIN_IDENTITY) + return; + + xhci_info(xhci, "Zeroing 64bit base registers, expecting fault\n");