Commit 65fc0fc1 authored by Mario Limonciello's avatar Mario Limonciello Committed by Greg Kroah-Hartman
Browse files

usb: xhci: Avoid showing warnings for dying controller 



When a USB4 dock is unplugged from a system it won't respond to ring
events. The PCI core handles the surprise removal event and notifies
all PCI drivers. The XHCI PCI driver sets a flag that the device is
being removed, and when the device stops responding a flag is also
added to indicate it's dying.

When that flag is set don't bother to show warnings about a missing
controller.

Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Acked-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20250717073107.488599-3-mathias.nyman@linux.intel.com


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

drivers/usb/host/xhci.c

+4 −2
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ int xhci_halt(struct xhci_hcd *xhci) 
	ret = xhci_handshake(&xhci->op_regs->status,

			STS_HALT, STS_HALT, XHCI_MAX_HALT_USEC);

	if (ret) {

		if (!(xhci->xhc_state & XHCI_STATE_DYING))

			xhci_warn(xhci, "Host halt failed, %d\n", ret);

		return ret;

	}
@@ -180,6 +181,7 @@ int xhci_reset(struct xhci_hcd *xhci, u64 timeout_us) 
	state = readl(&xhci->op_regs->status);



	if (state == ~(u32)0) {

		if (!(xhci->xhc_state & XHCI_STATE_DYING))

			xhci_warn(xhci, "Host not accessible, reset failed.\n");

		return -ENODEV;

	}