From: Greg KH <gregkh@linuxfoundation.org>
To: Rick Tseng <rtseng@nvidia.com>
Cc: mathias.nyman@intel.com, linux-usb@vger.kernel.org
Subject: Re: [PATCH] xhci: wait CNR when doing xhci resume
Date: Mon, 12 Aug 2019 15:39:01 +0200 [thread overview]
Message-ID: <20190812133901.GA8165@kroah.com> (raw)
In-Reply-To: <1565594692-23683-1-git-send-email-rtseng@nvidia.com>
On Mon, Aug 12, 2019 at 03:24:52PM +0800, Rick Tseng wrote:
> From: Rick <rtseng@nvidia.com>
>
> NVIDIA 3.1 xHCI card would lose power when moving power state into D3Cold.
> Thus we need to wait CNR bit to clear when xhci resmue as xhci init.
>
> Signed-off-by: Rick <rtseng@nvidia.com>
We need a "full" name on the from and signed-off-by lines, please.
> ---
> drivers/usb/host/xhci-pci.c | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
>
> diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
> index 1e0236e..857ad8a 100644
> --- a/drivers/usb/host/xhci-pci.c
> +++ b/drivers/usb/host/xhci-pci.c
> @@ -12,6 +12,7 @@
> #include <linux/slab.h>
> #include <linux/module.h>
> #include <linux/acpi.h>
> +#include <linux/iopoll.h>
>
> #include "xhci.h"
> #include "xhci-trace.h"
> @@ -455,6 +456,19 @@ static void xhci_pme_quirk(struct usb_hcd *hcd)
> readl(reg);
> }
>
> +static int xhci_poll_cnr(struct usb_hcd *hcd)
> +{
> + struct xhci_hcd *xhci = hcd_to_xhci(hcd);
> + void __iomem *reg = &xhci->op_regs->status;
> + u32 result;
> + int ret;
> +
> + ret = readl_poll_timeout_atomic(reg, result,
> + (result & STS_CNR) == 0,
> + 1, 100 * 1000);
> + return ret;
> +}
> +
> static int xhci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup)
> {
> struct xhci_hcd *xhci = hcd_to_xhci(hcd);
> @@ -508,6 +522,12 @@ static int xhci_pci_resume(struct usb_hcd *hcd, bool hibernated)
> if (pdev->vendor == PCI_VENDOR_ID_INTEL)
> usb_enable_intel_xhci_ports(pdev);
>
> + if (pdev->vendor == PCI_VENDOR_ID_NVIDIA) {
So all devices of this vendor need that? Are you _sure_? Why not just
blacklist a single device?
thanks,
greg k-h
prev parent reply other threads:[~2019-08-12 13:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-12 7:24 [PATCH] xhci: wait CNR when doing xhci resume Rick Tseng
2019-08-12 8:12 ` Felipe Balbi
2019-08-12 8:19 ` Oliver Neukum
2019-08-13 10:39 ` Mathias Nyman
2019-08-13 12:33 ` Rick Tseng
2019-08-13 12:36 ` Felipe Balbi
2019-08-13 13:12 ` Mathias Nyman
2019-08-12 13:39 ` Greg KH [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=20190812133901.GA8165@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.com \
--cc=rtseng@nvidia.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).