Commit 98d74f9c authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: fix 10 second timeout on removal of PCI hotpluggable xhci controllers 



PCI hotpluggable xhci controllers such as some Alpine Ridge solutions will
remove the xhci controller from the PCI bus when the last USB device is
disconnected.

Add a flag to indicate that the host is being removed to avoid queueing
configure_endpoint commands for the dropped endpoints.
For PCI hotplugged controllers this will prevent 5 second command timeouts
For static xhci controllers the configure_endpoint command is not needed
in the removal case as everything will be returned, freed, and the
controller is reset.

For now the flag is only set for PCI connected host controllers.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 71504062

drivers/usb/host/xhci-pci.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -304,6 +304,7 @@ static void xhci_pci_remove(struct pci_dev *dev) 
	struct xhci_hcd *xhci;

	struct xhci_hcd *xhci;





	xhci = hcd_to_xhci(pci_get_drvdata(dev));

	xhci = hcd_to_xhci(pci_get_drvdata(dev));

	xhci->xhc_state |= XHCI_STATE_REMOVING;

	if (xhci->shared_hcd) {

	if (xhci->shared_hcd) {

		usb_remove_hcd(xhci->shared_hcd);

		usb_remove_hcd(xhci->shared_hcd);

		usb_put_hcd(xhci->shared_hcd);

		usb_put_hcd(xhci->shared_hcd);

drivers/usb/host/xhci-ring.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -4004,7 +4004,8 @@ static int queue_command(struct xhci_hcd *xhci, struct xhci_command *cmd, 
	int reserved_trbs = xhci->cmd_ring_reserved_trbs;

	int reserved_trbs = xhci->cmd_ring_reserved_trbs;

	int ret;

	int ret;





	if (xhci->xhc_state) {

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

		(xhci->xhc_state & XHCI_STATE_HALTED)) {

		xhci_dbg(xhci, "xHCI dying or halted, can't queue_command\n");

		xhci_dbg(xhci, "xHCI dying or halted, can't queue_command\n");

		return -ESHUTDOWN;

		return -ESHUTDOWN;

	}

	}

drivers/usb/host/xhci.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -147,7 +147,8 @@ static int xhci_start(struct xhci_hcd *xhci) 
				"waited %u microseconds.\n",

				"waited %u microseconds.\n",

				XHCI_MAX_HALT_USEC);

				XHCI_MAX_HALT_USEC);

	if (!ret)

	if (!ret)

		xhci->xhc_state &= ~(XHCI_STATE_HALTED | XHCI_STATE_DYING);

		/* clear state flags. Including dying, halted or removing */

		xhci->xhc_state = 0;





	return ret;

	return ret;

}

}
@@ -2773,7 +2774,8 @@ int xhci_check_bandwidth(struct usb_hcd *hcd, struct usb_device *udev) 
	if (ret <= 0)

	if (ret <= 0)

		return ret;

		return ret;

	xhci = hcd_to_xhci(hcd);

	xhci = hcd_to_xhci(hcd);

	if (xhci->xhc_state & XHCI_STATE_DYING)

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

		(xhci->xhc_state & XHCI_STATE_REMOVING))

		return -ENODEV;

		return -ENODEV;





	xhci_dbg(xhci, "%s called for udev %p\n", __func__, udev);

	xhci_dbg(xhci, "%s called for udev %p\n", __func__, udev);
@@ -3820,7 +3822,7 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev, 




	mutex_lock(&xhci->mutex);

	mutex_lock(&xhci->mutex);





	if (xhci->xhc_state)	/* dying or halted */

	if (xhci->xhc_state)	/* dying, removing or halted */

		goto out;

		goto out;





	if (!udev->slot_id) {

	if (!udev->slot_id) {

drivers/usb/host/xhci.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -1605,6 +1605,7 @@ struct xhci_hcd { 
 */

 */

#define XHCI_STATE_DYING	(1 << 0)

#define XHCI_STATE_DYING	(1 << 0)

#define XHCI_STATE_HALTED	(1 << 1)

#define XHCI_STATE_HALTED	(1 << 1)

#define XHCI_STATE_REMOVING	(1 << 2)

	/* Statistics */

	/* Statistics */

	int			error_bitmask;

	int			error_bitmask;

	unsigned int		quirks;

	unsigned int		quirks;

CRA Git | Maintained and supported by SUSTech CRA and CCSE