FAILED: patch "[PATCH] xhci: also avoid the XHCI_ZERO_64B_REGS quirk with a" failed to apply to 4.19-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.19.y
git checkout FETCH_HEAD
git cherry-pick -x ecaa4902439298f6b0e29f47424a86b310a9ff4f
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023041023-unweave-bolt-64d3@gregkh' --subject-prefix 'PATCH 4.19.y' HEAD^..
Possible dependencies:
ecaa49024392 ("xhci: also avoid the XHCI_ZERO_64B_REGS quirk with a passthrough iommu") f7fac17ca925 ("xhci: Convert xhci_handshake() to use readl_poll_timeout_atomic()") 05afde1a7ef3 ("xhci: Use device_iommu_mapped()")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From ecaa4902439298f6b0e29f47424a86b310a9ff4f Mon Sep 17 00:00:00 2001
From: D Scott Phillips <[email protected]>
Date: Thu, 30 Mar 2023 17:30:54 +0300
Subject: [PATCH] xhci: also avoid the XHCI_ZERO_64B_REGS quirk with a
passthrough iommu
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.
drivers/usb/host/xhci.c +5 -1
@@ -9,6 +9,7 @@*/ #include <linux/pci.h> +#include <linux/iommu.h> #include <linux/iopoll.h> #include <linux/irq.h> #include <linux/log2.h>
@@ -228,6 +229,7 @@ int xhci_reset(struct xhci_hcd *xhci, u64 timeout_us)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;
@@ -246,7 +248,9 @@ static void xhci_zero_64b_regs(struct xhci_hcd *xhci)* 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" );