linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bjorn Helgaas <bhelgaas@google.com>
To: Yinghai Lu <yinghai@kernel.org>
Cc: linux-pci@vger.kernel.org
Subject: Re: [PATCH] PCI: fix pcie_wait_cmd with poll mode timeout
Date: Mon, 22 Sep 2014 20:29:45 -0600	[thread overview]
Message-ID: <20140923022945.GN1880@google.com> (raw)
In-Reply-To: <1408756512-16885-2-git-send-email-yinghai@kernel.org>

On Fri, Aug 22, 2014 at 06:15:08PM -0700, Yinghai Lu wrote:
> pcie_poll_cmd() take msecs instead of jiffies, need to convert
> timeout to msecs.
> 
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>

Thanks for the fix.  I applied this to for-linus for v3.17, because it
fixes a change (40b960831cfa) that we merged for v3.17, and the bug may
cause us to wait less than we should before timing out and issuing a new
hotplug command.

> ---
>  drivers/pci/hotplug/pciehp_hpc.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: linux-2.6/drivers/pci/hotplug/pciehp_hpc.c
> ===================================================================
> --- linux-2.6.orig/drivers/pci/hotplug/pciehp_hpc.c
> +++ linux-2.6/drivers/pci/hotplug/pciehp_hpc.c
> @@ -160,7 +160,7 @@ static void pcie_wait_cmd(struct control
>  	    ctrl->slot_ctrl & PCI_EXP_SLTCTL_CCIE)
>  		rc = wait_event_timeout(ctrl->queue, !ctrl->cmd_busy, timeout);
>  	else
> -		rc = pcie_poll_cmd(ctrl, timeout);
> +		rc = pcie_poll_cmd(ctrl, jiffies_to_msecs(timeout));
>  
>  	/*
>  	 * Controllers with errata like Intel CF118 don't generate

  reply	other threads:[~2014-09-23  2:29 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-23  1:15 [PATCH] PCI: add back missing MEM_64 mask check for hotplug path Yinghai Lu
2014-08-23  1:15 ` [PATCH] PCI: fix pcie_wait_cmd with poll mode timeout Yinghai Lu
2014-09-23  2:29   ` Bjorn Helgaas [this message]
2014-08-23  1:15 ` [PATCH] PCI: print out exact timeout in pciehp for wait_cmd Yinghai Lu
2014-09-23  2:35   ` Bjorn Helgaas
2014-09-24  1:53     ` Yinghai Lu
2014-08-23  1:15 ` [PATCH] PCI: don't release sibiling bridge resources during hotplug Yinghai Lu
2014-09-03 23:35   ` Bjorn Helgaas
2014-08-23  1:15 ` [PATCH] PCI: more debug printout for pcie_write_cmd in pciehp Yinghai Lu
2014-09-23  2:51   ` Bjorn Helgaas
2014-08-23  1:15 ` [PATCH] PCI: remove not needed pcie_disable_notification Yinghai Lu
2014-09-23  2:53   ` Bjorn Helgaas
2014-09-30 20:35 ` [PATCH] PCI: add back missing MEM_64 mask check for hotplug path Bjorn Helgaas
2014-10-01  5:06   ` Yinghai Lu
2014-10-01 20:07 ` Bjorn Helgaas

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=20140923022945.GN1880@google.com \
    --to=bhelgaas@google.com \
    --cc=linux-pci@vger.kernel.org \
    --cc=yinghai@kernel.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).