From: Simon Horman <horms@verge.net.au>
To: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Cc: gregkh@linuxfoundation.org, mathias.nyman@intel.com,
linux-usb@vger.kernel.org, linux-renesas-soc@vger.kernel.org,
stable@vger.kernel.org
Subject: Re: [PATCH] usb: host: xhci-rcar: Fix timeout in xhci_suspend()
Date: Fri, 9 Aug 2019 10:20:50 -0700 [thread overview]
Message-ID: <20190809172042.ce5oxx2iwj4r7s4k@verge.net.au> (raw)
In-Reply-To: <1564734815-17964-1-git-send-email-yoshihiro.shimoda.uh@renesas.com>
On Fri, Aug 02, 2019 at 05:33:35PM +0900, Yoshihiro Shimoda wrote:
> When a USB device is connected to the host controller and
> the system enters suspend, the following error happens
> in xhci_suspend():
>
> xhci-hcd ee000000.usb: WARN: xHC CMD_RUN timeout
>
> Since the firmware/internal CPU control the USBSTS.STS_HALT
> and the process speed is down when the roothub port enters U3,
> long delay for the handshake of STS_HALT is neeed in xhci_suspend().
> So, this patch adds to set the XHCI_SLOW_SUSPEND.
>
> Fixes: 435cc1138ec9 ("usb: host: xhci-plat: set resume_quirk() for R-Car controllers")
> Cc: <stable@vger.kernel.org> # v4.12+
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
> ---
> drivers/usb/host/xhci-rcar.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
> index 671bce1..8616c52 100644
> --- a/drivers/usb/host/xhci-rcar.c
> +++ b/drivers/usb/host/xhci-rcar.c
> @@ -238,10 +238,15 @@ int xhci_rcar_init_quirk(struct usb_hcd *hcd)
> * pointers. So, this driver clears the AC64 bit of xhci->hcc_params
> * to call dma_set_coherent_mask(dev, DMA_BIT_MASK(32)) in
> * xhci_gen_setup().
> + *
> + * And, since the firmware/internal CPU control the USBSTS.STS_HALT
> + * and the process speed is down when the roothub port enters U3,
> + * long delay for the handshake of STS_HALT is neeed in xhci_suspend().
> */
> if (xhci_rcar_is_gen2(hcd->self.controller) ||
> - xhci_rcar_is_gen3(hcd->self.controller))
> - xhci->quirks |= XHCI_NO_64BIT_SUPPORT;
> + xhci_rcar_is_gen3(hcd->self.controller)) {
> + xhci->quirks |= XHCI_NO_64BIT_SUPPORT | XHCI_SLOW_SUSPEND;
> + }
nit: As there is still only one line guarded by the conditional I don't
think that { } need to be added.
>
> if (!xhci_rcar_wait_for_pll_active(hcd))
> return -ETIMEDOUT;
> --
> 2.7.4
>
prev parent reply other threads:[~2019-08-09 17:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-02 8:33 [PATCH] usb: host: xhci-rcar: Fix timeout in xhci_suspend() Yoshihiro Shimoda
2019-08-09 17:20 ` Simon Horman [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190809172042.ce5oxx2iwj4r7s4k@verge.net.au \
--to=horms@verge.net.au \
--cc=gregkh@linuxfoundation.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.com \
--cc=stable@vger.kernel.org \
--cc=yoshihiro.shimoda.uh@renesas.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).