From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754183AbcHAQJG (ORCPT ); Mon, 1 Aug 2016 12:09:06 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:59474 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754065AbcHAQIr (ORCPT ); Mon, 1 Aug 2016 12:08:47 -0400 From: Kamal Mostafa To: Mathias Nyman , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Gabriel Krisman Bertazi , Kamal Mostafa Subject: [PATCH] xhci: Fix soft lockup in xhci_pci_probe path when XHCI_STATE_HALTED Date: Mon, 1 Aug 2016 09:08:38 -0700 Message-Id: <1470067718-13042-1-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 27a41a83ec54 ("xhci: Cleanup only when releasing primary hcd") causes a soft lockup at boot when XHCI_STATE_HALTED, preventing VirtualBox 5.1.x from booting if USB3.0 is enabled. Revert to allowing xhci_irq to handle the interrupt when XHCI_STATE_HALTED but not XHCI_STATE_DYING. Fixes: 27a41a83ec54 ("xhci: Cleanup only when releasing primary hcd") BugLink: https://bugs.launchpad.net/bugs/1604058 Signed-off-by: Kamal Mostafa Cc: #v4.3+ Cc: Gabriel Krisman Bertazi Acked-by: Tim Gardner Acked-by: Stefan Bader --- drivers/usb/host/xhci-ring.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 918e0c7..1d36a5f 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -2751,8 +2751,7 @@ hw_died: writel(irq_pending, &xhci->ir_set->irq_pending); } - if (xhci->xhc_state & XHCI_STATE_DYING || - xhci->xhc_state & XHCI_STATE_HALTED) { + if (xhci->xhc_state & XHCI_STATE_DYING) { xhci_dbg(xhci, "xHCI dying, ignoring interrupt. " "Shouldn't IRQs be disabled?\n"); /* Clear the event handler busy flag (RW1C); @@ -2764,6 +2763,8 @@ hw_died: spin_unlock(&xhci->lock); return IRQ_HANDLED; + } else if (xhci->xhc_state & XHCI_STATE_HALTED) { + xhci_dbg(xhci, "xHCI halted, handling interrupt.\n"); } event_ring_deq = xhci->event_ring->dequeue; -- 2.7.4