| From 576d55460e7f209139545a348746c2fcadf61bc3 Mon Sep 17 00:00:00 2001 |
| From: Peter Chen <peter.chen@nxp.com> |
| Date: Thu, 20 Jul 2017 14:48:30 +0300 |
| Subject: usb: xhci: fix spinlock recursion for USB2 test mode |
| |
| From: Peter Chen <peter.chen@nxp.com> |
| |
| commit 576d55460e7f209139545a348746c2fcadf61bc3 upstream. |
| |
| 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. |
| |
| Fixes: 0f1d832ed1fb ("usb: xhci: Add port test modes support for usb2") |
| Signed-off-by: Peter Chen <peter.chen@nxp.com> |
| Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/host/xhci-hub.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- 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 x |
| |
| /* 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*/ |
