From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 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> Date: Fri, 22 Apr 2016 12:36:42 +0300 Message-ID: <87mvom7zo5.fsf@intel.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" Sender: stable-owner@vger.kernel.org List-ID: --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable 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=3Dy 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 an= d 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) >=20=20 > 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: diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index 676ea458148b..3e39320564ce 100644 =2D-- 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[] = =3D { }, { .compatible =3D "marvell,armada-380-xhci", .data =3D &xhci_plat_marvell_armada, +#if IS_ENABLED(CONFIG_USB_XHCI_RCAR) }, { .compatible =3D "renesas,xhci-r8a7790", .data =3D &xhci_plat_renesas_rcar_gen2, @@ -130,6 +131,7 @@ static const struct of_device_id usb_xhci_of_match[] = =3D { }, { .compatible =3D "renesas,rcar-gen3-xhci", .data =3D &xhci_plat_renesas_rcar_gen3, +#endif }, {}, }; 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 ? =2D-=20 balbi --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJXGfCqAAoJEIaOsuA1yqRERPMQAJ/YBSfN58fukrVAlVKcD58X NHxiKdD2IzP+JUayEB+Lxh/BiaPckC3CsuHIb/x2MvdbcRwKQRq9wHRwMnyNeJa8 f9XdLOKMhqm62gIzweQIG8KzE+ZcpAaSQiEp0Bl27q0eM9P73qLLLsNbCyaFgd/U p88OH/IwQrJyhtUdueBqoCv6LPbUF1oLbKvunwmzvztTO3zE7O3P92crL0+PtePX eHb8c/uimlBaILQ4tpB8o/690jPSYewiCsiPPIeWjCgWKMxcLV5QuQFb1RUCZffA Ypnc3N2R+X5DZv99n55XpoY7j21ip6JngeY77qWGyJINu5cwcweghnvsbo+Qfjo0 KsGyWbUbl+GFruaeJBT6ErP62Uc9PRTaH4twYyfBgz0ZdH8dIlE32W75oJyh0A5s Axvx+To8/aFHcayGclx5jpH8jpHfemKmYbvEt6XLIhUp15/f5Et7MvYJjER/1GK/ rr0xxRdEI0RFxevKbQ0V2y+WuuZaJG4+MxHhmYvu3RjRk/urIwvVZ3O13tmrVvb1 h2cO27ZpPUkhJhJpTBrWaU8d32pRzxY06wezAcUaDmxk3l/ve/nraLg8Y3A/UHim Pj7/FSGcm4Q8UYdStmgPA9QafygnjhUkkgF6YbTB0VBTWXuXLinkwBhcrD/EEY5a 0yD/Q0FjxdQPkMcIxLc9 =03mV -----END PGP SIGNATURE----- --=-=-=--