From: Gavin Shan <gwshan@linux.vnet.ibm.com>
To: Alex Williamson <alex.williamson@redhat.com>
Cc: linux-pci@vger.kernel.org, bhelgaas@google.com,
ben@decadent.org.uk, gwshan@linux.vnet.ibm.com,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] pci: Fix unaligned access testing AF transaction pending
Date: Fri, 13 Jun 2014 09:33:37 +1000 [thread overview]
Message-ID: <20140612233336.GA4404@shangw> (raw)
In-Reply-To: <20140612152732.4162.23298.stgit@bling.home>
On Thu, Jun 12, 2014 at 09:28:07AM -0600, Alex Williamson wrote:
>pci_wait_for_pending() uses word access, so we shouldn't be passing
>an offset that is only byte aligned. Use the control register offset
>instead, shifting the mask to match.
>
>Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
>Reported-by: Ben Hutchings <ben@decadent.org.uk>
>Cc: stable@vger.kernel.org
Acked-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
>---
> drivers/pci/pci.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
>index 759475e..81012ec 100644
>--- a/drivers/pci/pci.c
>+++ b/drivers/pci/pci.c
>@@ -3109,8 +3109,13 @@ static int pci_af_flr(struct pci_dev *dev, int probe)
> if (probe)
> return 0;
>
>- /* Wait for Transaction Pending bit clean */
>- if (pci_wait_for_pending(dev, pos + PCI_AF_STATUS, PCI_AF_STATUS_TP))
>+ /*
>+ * Wait for Transaction Pending bit to clear. A word-aligned test
>+ * is used, so we use the conrol offset rather than status and shift
>+ * the test bit to match.
>+ */
>+ if (pci_wait_for_pending(dev, pos + PCI_AF_CTRL,
>+ PCI_AF_STATUS_TP << 8))
> goto clear;
>
> dev_err(&dev->dev, "transaction is not cleared; "
>
Thanks,
Gavin
next prev parent reply other threads:[~2014-06-12 23:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-12 15:28 [PATCH] pci: Fix unaligned access testing AF transaction pending Alex Williamson
2014-06-12 23:33 ` Gavin Shan [this message]
2014-06-17 21:47 ` 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=20140612233336.GA4404@shangw \
--to=gwshan@linux.vnet.ibm.com \
--cc=alex.williamson@redhat.com \
--cc=ben@decadent.org.uk \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.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