diff mbox series

[RESEND] xhci: Remove iommu condition for Renesas PCIe controllers

Message ID 20221102014340.129587-1-gehao@kylinos.cn
State New
Headers show
Series [RESEND] xhci: Remove iommu condition for Renesas PCIe controllers | expand

Commit Message

gehao@kylinos.cn Nov. 2, 2022, 1:43 a.m. UTC
When we use uPD720201 USB 3.0 Host Controller passthrough to VM
guest os will report follow errors and it can not working.

xhci_hcd 0000:09:00.0: Host took too long to start, waited 16000
microseconds.
xhci_hcd 0000:09:00.0: startup error -19.

Renesas controllers preserve the top half of the address in internal,
non visible registers,and end up with half the address coming from the
kernel, and the other half coming from the firmware.

For guest os,although our dev->iommu_group = NULL,but we are still under
iommu control.

This condition is not necessary,because for os with noiommu,doing
anything when there is no iommu is definitely,and when our os with
iommu,it is safe.

Signed-off-by: gehao <gehao@kylinos.cn>
---
 drivers/usb/host/xhci.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 79d7931c048a..589d54ecd2a4 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -227,7 +227,6 @@  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;
 	int err, i;
 	u64 val;
 	u32 intrs;
@@ -241,12 +240,8 @@  static void xhci_zero_64b_regs(struct xhci_hcd *xhci)
 	 * changing the programming leads to extra accesses even if the
 	 * controller is supposed to be halted. The controller ends up with
 	 * a fatal fault, and is then ripe for being properly reset.
-	 *
-	 * Special care is taken to only apply this if the device is behind
-	 * an iommu. Doing anything when there is no iommu is definitely
-	 * unsafe...
 	 */
-	if (!(xhci->quirks & XHCI_ZERO_64B_REGS) || !device_iommu_mapped(dev))
+	if (!(xhci->quirks & XHCI_ZERO_64B_REGS))
 		return;
 
 	xhci_info(xhci, "Zeroing 64bit base registers, expecting fault\n");