Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+8
-3
+1
-1
MAINTAINERS
+1
-1
MAINTAINERS
···
6787
6787
6788
6788
PCI DRIVER FOR IMX6
6789
6789
M: Richard Zhu <r65037@freescale.com>
6790
-
M: Shawn Guo <shawn.guo@linaro.org>
6790
+
M: Shawn Guo <shawn.guo@freescale.com>
6791
6791
L: linux-pci@vger.kernel.org
6792
6792
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
6793
6793
S: Maintained
+7
-2
drivers/pci/pci.c
+7
-2
drivers/pci/pci.c
···
3135
3135
if (probe)
3136
3136
return 0;
3137
3137
3138
-
/* Wait for Transaction Pending bit clean */
3139
-
if (pci_wait_for_pending(dev, pos + PCI_AF_STATUS, PCI_AF_STATUS_TP))
3138
+
/*
3139
+
* Wait for Transaction Pending bit to clear. A word-aligned test
3140
+
* is used, so we use the conrol offset rather than status and shift
3141
+
* the test bit to match.
3142
+
*/
3143
+
if (pci_wait_for_pending(dev, pos + PCI_AF_CTRL,
3144
+
PCI_AF_STATUS_TP << 8))
3140
3145
goto clear;
3141
3146
3142
3147
dev_err(&dev->dev, "transaction is not cleared; proceeding with reset anyway\n");