Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752724AbbHRMMf (ORCPT ); Tue, 18 Aug 2015 08:12:35 -0400 Received: from mga14.intel.com ([192.55.52.115]:60613 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750855AbbHRMMe (ORCPT ); Tue, 18 Aug 2015 08:12:34 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,701,1432623600"; d="scan'208";a="786289002" Message-ID: <55D32196.2010704@intel.com> Date: Tue, 18 Aug 2015 15:14:14 +0300 From: Mathias Nyman User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: Roger Quadros CC: balbi@ti.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org 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> In-Reply-To: <1439894354-6160-5-git-send-email-rogerq@ti.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2043 Lines: 66 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. Applied -Mathias -- 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/