From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga14.intel.com ([192.55.52.115]:44559 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753458AbcDYGgS (ORCPT ); Mon, 25 Apr 2016 02:36:18 -0400 From: Felipe Balbi To: Yoshihiro Shimoda , Rob Herring Cc: Mathias Nyman , Greg Kroah-Hartman , Linux USB List , "linux-renesas-soc\@vger.kernel.org" , stable Subject: RE: [PATCH v2] usb: host: xhci-rcar: Avoid long wait in xhci_reset() In-Reply-To: References: <1461316076-1444-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> <87mvom7zo5.fsf@intel.com> Date: Mon, 25 Apr 2016 09:34:14 +0300 Message-ID: <87shyaryc9.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: >> > 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 H= 2 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-rca= r.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_RCA= R 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 >> > --- 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 ? >>=20 >> We should fix this in kconfig to always enable the option when RCAR is >> enabled IMO. > > I could fix this in kconfig like the followings: > > diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kcon= fig > index f2bc5c3..905d1d2 100644 > --- a/arch/arm/mach-shmobile/Kconfig > +++ b/arch/arm/mach-shmobile/Kconfig > @@ -46,6 +46,7 @@ menuconfig ARCH_RENESAS > select PINCTRL > select ARCH_REQUIRE_GPIOLIB > select ZONE_DMA if ARM_LPAE > + select USB_XHCI_RCAR if USB_XHCI_HCD >=20=20 > if ARCH_RENESAS >=20=20 > diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms > index efa77c1..010d2b7 100644 > --- a/arch/arm64/Kconfig.platforms > +++ b/arch/arm64/Kconfig.platforms > @@ -105,6 +105,7 @@ config ARCH_RENESAS > select PM > select PM_GENERIC_DOMAINS > select RENESAS_IRQC > + select USB_XHCI_RCAR if USB_XHCI_HCD > help > This enables support for the ARMv8 based Renesas SoCs. > > If this is acceptable, I will send each patch to arm / arm64. I'm okay with that, not sure what the ARM folks will think ;-) =2D-=20 balbi --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJXHbpmAAoJEIaOsuA1yqREyeYP+gPZn9qBBYhS18M6HBiYIa2x EqBUUy0BL2kw9aOWdb7/tyT5sTccJt+DrHcsPCli5yDTp6vVYR6b3RHlB+Biyn4w iCEhwP2WEOdZ1A9tLFzIO1M7YfvM05lv4lcmk1yWBm0a+WrK15u0NRkfrv9qFCPl WxqUJ9ovz1jEaRunLsdq4c3nvgqjwQOkjEWIl7G1HGPho/WHerQpa2ZMgP5p1DUV 5KLSFOwBB3wiodVTfg1cvTiz8pmFZGaNNLuCLNxdtloO3KGoN6CAZYTLjfMDP2av R0itPoTnTDPqTTjAAt7OwFLP976hjqSRBUCkStS+BH9gZyuzmwC6Qd5sX4dEdkj/ 67pk63yV3uho6aiRbrI2QYzXN8b+zYs5B13JBCiGSUTrDrRah0DRUgflW+9Cdjp1 GHZAr9gR+QPUgIoZJUWGxsHRWLNlaYJt+ZN04Ws+Li2B0xa9HxiiXU6eQYwxlgAP DEE1bw4egZrBGNkL5KcI9zQIf9R1ekpdA8xKpZ7H8ayId6ddYwRC/swn+FYJjnG9 n1pxhuSt44OIaOp0zTtOX99DBhVpEn6XmACBfGP3V1/sfc1q0ehOP7gvWgjAcgj6 LFBskUkgvpD+NTqfHANksYZ1ariyR6rNb/qJGuEUz8SOHt8ybf0x2FKdbvAeLPE2 gjLQPnZANiIA/KyL2lcs =wuue -----END PGP SIGNATURE----- --=-=-=--