Skip to content

Commit 9be486c

Browse files
roychl666gregkh
authored andcommitted
usb: xhci: Skip xhci_reset in xhci_resume if xhci is being removed
commit 3eff494 upstream. xhci_reset() currently returns -ENODEV if XHCI_STATE_REMOVING is set, without completing the xhci handshake, unless the reset completes exceptionally quickly. This behavior causes a regression on Synopsys DWC3 USB controllers with dual-role capabilities. Specifically, when a DWC3 controller exits host mode and removes xhci while a reset is still in progress, and then attempts to configure its hardware for device mode, the ongoing, incomplete reset leads to critical register access issues. All register reads return zero, not just within the xHCI register space (which might be expected during a reset), but across the entire DWC3 IP block. This patch addresses the issue by preventing xhci_reset() from being called in xhci_resume() and bailing out early in the reinit flow when XHCI_STATE_REMOVING is set. Cc: stable <stable@kernel.org> Fixes: 6ccb83d ("usb: xhci: Implement xhci_handshake_check_state() helper") Suggested-by: Mathias Nyman <mathias.nyman@intel.com> Signed-off-by: Roy Luo <royluo@google.com> Link: https://lore.kernel.org/r/20250522190912.457583-2-royluo@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 294b3a6 commit 9be486c

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

drivers/usb/host/xhci.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1084,7 +1084,10 @@ int xhci_resume(struct xhci_hcd *xhci, bool power_lost, bool is_auto_resume)
10841084
xhci_dbg(xhci, "Stop HCD\n");
10851085
xhci_halt(xhci);
10861086
xhci_zero_64b_regs(xhci);
1087-
retval = xhci_reset(xhci, XHCI_RESET_LONG_USEC);
1087+
if (xhci->xhc_state & XHCI_STATE_REMOVING)
1088+
retval = -ENODEV;
1089+
else
1090+
retval = xhci_reset(xhci, XHCI_RESET_LONG_USEC);
10881091
spin_unlock_irq(&xhci->lock);
10891092
if (retval)
10901093
return retval;

0 commit comments

Comments
 (0)