Message ID | 1440420167-8879-2-git-send-email-mpe@ellerman.id.au (mailing list archive) |
---|---|
State | New, archived |
Delegated to: | Bjorn Helgaas |
Headers | show |
On Mon, 2015-24-08 at 12:42:47 UTC, Michael Ellerman wrote: > From: "Guilherme G. Piccoli" <gpiccoli@linux.vnet.ibm.com> > > Since commit 1851617cd2da ("PCI/MSI: Disable MSI at enumeration even if > kernel doesn't support MSI"), the setup of dev->msi_cap/msix_cap and the > disable of MSI/MSI-X interrupts isn't being done at PCI probe time, as > the logic responsible for this was moved in the aforementioned commit > from pci_device_add() to pci_setup_device(). The latter function is not > reachable on PowerPC pseries platform during Open Firmware PCI probing > time. > > This exhibits as drivers not being able to enable MSI, eg: > > bnx2x 0000:01:00.0: no msix capability found > > This patch calls pci_msi_setup_pci_dev() explicitly to disable MSI/MSI-X > during PCI probe time on pSeries platform. > > Fixes: 1851617cd2da ("PCI/MSI: Disable MSI at enumeration even if kernel doesn't support MSI") > [mpe: Flesh out change log and clarify comment] > Signed-off-by: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com> > Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Applied to powerpc fixes. https://git.kernel.org/powerpc/c/4d9aac397a5d8f4ee26a4178 cheers -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c index 42e02a2d570b..efc3fa54c90b 100644 --- a/arch/powerpc/kernel/pci_of_scan.c +++ b/arch/powerpc/kernel/pci_of_scan.c @@ -191,6 +191,9 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, pci_device_add(dev, bus); + /* Setup MSI caps & disable MSI/MSI-X interrupts */ + pci_msi_setup_pci_dev(dev); + return dev; } EXPORT_SYMBOL(of_create_pci_dev);