Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752537AbbHTGmO (ORCPT ); Thu, 20 Aug 2015 02:42:14 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:43457 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751492AbbHTGmM (ORCPT ); Thu, 20 Aug 2015 02:42:12 -0400 Message-ID: <55D576C0.3040602@ti.com> Date: Thu, 20 Aug 2015 09:42:08 +0300 From: Roger Quadros User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: Mathias Nyman CC: , , Subject: Re: [PATCH 4/5] usb: xhci: stop everything on the first call to xhci_stop References: <1439894354-6160-1-git-send-email-rogerq@ti.com> <1439894354-6160-5-git-send-email-rogerq@ti.com> <55D32196.2010704@intel.com> In-Reply-To: <55D32196.2010704@intel.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2240 Lines: 71 On 18/08/15 15:14, Mathias Nyman wrote: > On 18.08.2015 13:39, Roger Quadros wrote: >> xhci_stop will be called twice, once for the shared hcd >> and again for the primary hcd. >> >> We stop the XHCI controller in any case so clean up >> everything on the first call else we can timeout >> waiting for pending requests to complete. >> >> Signed-off-by: Roger Quadros >> --- >> drivers/usb/host/xhci.c | 20 +++++--------------- >> 1 file changed, 5 insertions(+), 15 deletions(-) >> >> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c >> index d5f44b1..9a7f12c 100644 >> --- a/drivers/usb/host/xhci.c >> +++ b/drivers/usb/host/xhci.c >> @@ -655,15 +655,6 @@ int xhci_run(struct usb_hcd *hcd) >> } >> EXPORT_SYMBOL_GPL(xhci_run); >> >> -static void xhci_only_stop_hcd(struct usb_hcd *hcd) >> -{ >> - struct xhci_hcd *xhci = hcd_to_xhci(hcd); >> - >> - spin_lock_irq(&xhci->lock); >> - xhci_halt(xhci); >> - spin_unlock_irq(&xhci->lock); >> -} >> - >> /* >> * Stop xHCI driver. >> * >> @@ -678,15 +669,14 @@ void xhci_stop(struct usb_hcd *hcd) >> u32 temp; >> struct xhci_hcd *xhci = hcd_to_xhci(hcd); >> >> - mutex_lock(&xhci->mutex); >> - >> - if (!usb_hcd_is_primary_hcd(hcd)) { >> - xhci_only_stop_hcd(xhci->shared_hcd); >> - mutex_unlock(&xhci->mutex); >> + if (xhci->xhc_state & XHCI_STATE_HALTED) >> return; >> - } >> >> + mutex_lock(&xhci->mutex); >> spin_lock_irq(&xhci->lock); >> + xhci->xhc_state |= XHCI_STATE_HALTED; >> + xhci->cmd_ring_state = CMD_RING_STATE_STOPPED; >> + > > The XHCI_STATE_HALTED and CMD_RING_STATE_STOPPED states will be set in xhci_halt() right > after this. > Well, or, it actually sets them after waiting for the controller to really halt. > > I guess setting them here helps the second call to hcd_stop() to return early, not taking the mutex and > trying to stop controller once again. Yes, that was my intention :) cheers, -roger -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/