From patchwork Fri Apr 22 09:36:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 8907541 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-renesas-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8BA83BF29F for ; Fri, 22 Apr 2016 09:39:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B02852014A for ; Fri, 22 Apr 2016 09:39:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AED1120122 for ; Fri, 22 Apr 2016 09:39:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752876AbcDVJi6 (ORCPT ); Fri, 22 Apr 2016 05:38:58 -0400 Received: from mga01.intel.com ([192.55.52.88]:52440 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752093AbcDVJio (ORCPT ); Fri, 22 Apr 2016 05:38:44 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 22 Apr 2016 02:38:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,516,1455004800"; d="asc'?scan'208";a="964171120" Received: from pipin.fi.intel.com (HELO localhost) ([10.237.68.36]) by fmsmga002.fm.intel.com with ESMTP; 22 Apr 2016 02:38:42 -0700 From: Felipe Balbi To: Yoshihiro Shimoda , mathias.nyman@intel.com, gregkh@linuxfoundation.org, robh+dt@kernel.org Cc: linux-usb@vger.kernel.org, linux-renesas-soc@vger.kernel.org, stable@vger.kernel.org, Yoshihiro Shimoda Subject: Re: [PATCH v2] usb: host: xhci-rcar: Avoid long wait in xhci_reset() In-Reply-To: <1461316076-1444-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> References: <1461316076-1444-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> User-Agent: Notmuch/0.21+96~g9bbc54b (http://notmuchmail.org) Emacs/25.0.90.3 (x86_64-pc-linux-gnu) Date: Fri, 22 Apr 2016 12:36:42 +0300 Message-ID: <87mvom7zo5.fsf@intel.com> MIME-Version: 1.0 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi, Yoshihiro Shimoda writes: > The firmware of R-Car USB 3.0 host controller will control the reset. > So, if the xhci driver doesn't do firmware downloading (e.g. kernel > configuration is CONFIG_USB_XHCI_PLATFORM=y and CONFIG_USB_XHCI_RCAR > is not set), the reset of USB 3.0 host controller doesn't work > correctly. Then, the host controller will cause long wait in > xhci_reset() because the CMD_RESET bit of op_regs->command is not > cleared for 10 seconds. > > So, this patch modifies the xhci_rcar_init_quirk() in xhci-rcar.h > to exit the probe function immediately. > > Fixes: 4ac8918f3a7 (usb: host: xhci-plat: add support for the R-Car H2 and M2 xHCI controllers) > Cc: # v3.17+ > Signed-off-by: Yoshihiro Shimoda > --- > Changes from v1: > - Revise the commit log. > (http://www.spinics.net/lists/stable/msg130007.html) > > drivers/usb/host/xhci-rcar.h | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/host/xhci-rcar.h b/drivers/usb/host/xhci-rcar.h > index 2941a25..2afed68 100644 > --- a/drivers/usb/host/xhci-rcar.h > +++ b/drivers/usb/host/xhci-rcar.h > @@ -24,7 +24,11 @@ static inline void xhci_rcar_start(struct usb_hcd *hcd) > > static inline int xhci_rcar_init_quirk(struct usb_hcd *hcd) > { > - return 0; > + /* > + * To avoid wait and timeout in xhci_reset() if CONFIG_XHCI_RCAR is > + * disabled, this function fails. > + */ > + return -ENODEV; okay, if I understood correctly the thing is that you have a kernel built with XHCI platform support but without XHCI RCAR support. Then, if you run this kernel on RCAR board, you see this CMD_RESET problem, right? Isn't this pointing to the fact that xhci-plat.ko built without RCAR isn't exactly compatible with RCAR ? IOW: Rob, should we limit compatible flags like this ? Without CONFIG_USB_XHCI_RCAR, this driver won't work on RCAR but, as you can see, this driver might still work on other non-RCAR platforms. What's your take on this ? diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index 676ea458148b..3e39320564ce 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -112,6 +112,7 @@ static const struct of_device_id usb_xhci_of_match[] = { }, { .compatible = "marvell,armada-380-xhci", .data = &xhci_plat_marvell_armada, +#if IS_ENABLED(CONFIG_USB_XHCI_RCAR) }, { .compatible = "renesas,xhci-r8a7790", .data = &xhci_plat_renesas_rcar_gen2, @@ -130,6 +131,7 @@ static const struct of_device_id usb_xhci_of_match[] = { }, { .compatible = "renesas,rcar-gen3-xhci", .data = &xhci_plat_renesas_rcar_gen3, +#endif }, {}, };