Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f440cd5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 191d385f bf177a1e

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/pci/pci.c

+7 −2
Original line number Diff line number Diff line
@@ -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");