[PATCH 1/1] usb: xhci: fix spinlock recursion for USB2 test mode

[PATCH 1/1] usb: xhci: fix spinlock recursion for USB2 test mode

[Peter Chen]

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: 0f1d832ed1fb ("usb: xhci: Add port test modes support for usb2")
Signed-off-by: Peter Chen <peter.chen@nxp.com>
---
 drivers/usb/host/xhci-hub.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index 1adae9e..741ff92 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -603,12 +603,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*/
-- 
2.7.4

Re: [PATCH 1/1] usb: xhci: fix spinlock recursion for USB2 test mode

[Mathias Nyman]

On 19.07.2017 10:28, Peter Chen wrote:
> 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: 0f1d832ed1fb ("usb: xhci: Add port test modes support for usb2")
> Signed-off-by: Peter Chen <peter.chen@nxp.com>

Thanks, adding

-Mathias