Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47132be1 authored by D Scott Phillips's avatar D Scott Phillips Committed by Greg Kroah-Hartman
Browse files

xhci: also avoid the XHCI_ZERO_64B_REGS quirk with a passthrough iommu 



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: 12de0a35 ("xhci: Add quirk to zero 64bit registers on Renesas PCIe controllers")
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarD Scott Phillips <scott@os.amperecomputing.com>
Acked-by: default avatarMarc Zyngier <maz@kernel.org>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20230330143056.1390020-2-mathias.nyman@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5fccf2c5

drivers/usb/host/xhci.c

+5 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 */



#include <linux/pci.h>

#include <linux/iommu.h>

#include <linux/iopoll.h>

#include <linux/irq.h>

#include <linux/log2.h>
@@ -226,6 +227,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;
@@ -244,7 +246,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");