diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-09 16:18:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-09 16:18:18 -0700 |
| commit | 4f440cd534359f689cb577c68f8491d1eddf0b76 (patch) | |
| tree | 3fd302d5c6facb7cdbac58854f82175dd8a8a83d | |
| parent | 191d385f253a317ed905b06137b48e5990e700cf (diff) | |
| parent | bf177a1eb6d106ba195de86734392d43dfbef702 (diff) | |
| download | linux-4f440cd534359f689cb577c68f8491d1eddf0b76.tar.bz2 | |
Merge tag 'pci-v3.16-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"Just a fix for the device reset path and an email address update.
Virtualization
- Fix "wait for pending transactions" for PCI AF reset (Alex
Williamson)
Miscellaneous
- Update mx6 PCI driver maintainer email (Fabio Estevam)"
* tag 'pci-v3.16-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
MAINTAINERS: Update mx6 PCI driver maintainer's email
PCI: Fix unaligned access in AF transaction pending test
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/pci/pci.c | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5eb2398a7fab..c411c40d8854 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6787,7 +6787,7 @@ F: arch/x86/kernel/quirks.c PCI DRIVER FOR IMX6 M: Richard Zhu <r65037@freescale.com> -M: Shawn Guo <shawn.guo@linaro.org> +M: Shawn Guo <shawn.guo@freescale.com> L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 63a54a340863..1c8592b0e146 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -3135,8 +3135,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; proceeding with reset anyway\n"); |