From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
To: Michael Spang <spang@chromium.org>
Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: Re: [PATCH] Increase XHCI suspend timeout to 16ms
Date: Mon, 17 Sep 2012 10:56:16 -0700 [thread overview]
Message-ID: <20120917175616.GA7924@xanatos> (raw)
In-Reply-To: <1347642349-9397-1-git-send-email-spang@chromium.org>
On Fri, Sep 14, 2012 at 01:05:49PM -0400, Michael Spang wrote:
> The Intel XHCI specification says that after clearing the run/stop bit
> the controller may take up to 16ms to halt. We've seen a device take
> 14ms, which with the current timeout of 10ms causes the kernel to
> abort the suspend. Increasing the timeout to the recommended value
> fixes the problem.
Thanks for tracking this down, Michael. I'll queue this to Greg in a
couple days.
>
> Signed-off-by: Michael Spang <spang@chromium.org>
> ---
> drivers/usb/host/xhci.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
> index c59d5b5..7710ccf 100644
> --- a/drivers/usb/host/xhci.c
> +++ b/drivers/usb/host/xhci.c
> @@ -785,7 +785,7 @@ int xhci_suspend(struct xhci_hcd *xhci)
> command &= ~CMD_RUN;
> xhci_writel(xhci, command, &xhci->op_regs->command);
> if (handshake(xhci, &xhci->op_regs->status,
> - STS_HALT, STS_HALT, 100*100)) {
> + STS_HALT, STS_HALT, XHCI_MAX_HALT_USEC)) {
> xhci_warn(xhci, "WARN: xHC CMD_RUN timeout\n");
> spin_unlock_irq(&xhci->lock);
> return -ETIMEDOUT;
> --
> 1.7.7.3
>
prev parent reply other threads:[~2012-09-17 17:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-14 17:05 [PATCH] Increase XHCI suspend timeout to 16ms Michael Spang
2012-09-17 17:56 ` Sarah Sharp [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=20120917175616.GA7924@xanatos \
--to=sarah.a.sharp@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=spang@chromium.org \
/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).