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

Commit 576d5546 authored by Peter Chen's avatar Peter Chen Committed by Greg Kroah-Hartman
Browse files

usb: xhci: fix spinlock recursion for USB2 test mode 



Both xhci_hub_control and xhci_disable_slot tries to hold spinlock, the
spinlock recursion occurs when enters USB2 test mode. Fix it by unlock
spinlock before calling xhci_disable_slot.

Cc: <stable@vger.kernel.org>
Fixes: 0f1d832e ("usb: xhci: Add port test modes support for usb2")
Signed-off-by: default avatarPeter Chen <peter.chen@nxp.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a54408d0

drivers/usb/host/xhci-hub.c

+2 −0
Original line number Diff line number Diff line
@@ -610,12 +610,14 @@ static int xhci_enter_test_mode(struct xhci_hcd *xhci, 


	/* Disable all Device Slots */

	xhci_dbg(xhci, "Disable all slots\n");

	spin_unlock_irqrestore(&xhci->lock, *flags);

	for (i = 1; i <= HCS_MAX_SLOTS(xhci->hcs_params1); i++) {

		retval = xhci_disable_slot(xhci, NULL, i);

		if (retval)

			xhci_err(xhci, "Failed to disable slot %d, %d. Enter test mode anyway\n",

				 i, retval);

	}

	spin_lock_irqsave(&xhci->lock, *flags);

	/* Put all ports to the Disable state by clear PP */

	xhci_dbg(xhci, "Disable all port (PP = 0)\n");

	/* Power off USB3 ports*/