[PATCH v2 2/2] powerpc/PCI: Disable MSI/MSI-X interrupts at PCI probe time in OF case
bhelgaas at google.com
Fri Sep 4 03:56:24 AEST 2015
[+cc Fam, Yinghai, Yijing, Eric (reviewers of MST's original series), Dave]
On Wed, Aug 19, 2015 at 03:54:10PM -0300, Guilherme G. Piccoli wrote:
> Changes since v2:
> * Added "Fixes" line
> * Improved commit reference by using 12 first chars of SHA
> Since the commit 1851617cd2da ("PCI/MSI: Disable MSI at enumeration even
> if kernel doesn't support MSI"), MSI/MSI-X interrupts aren't being
> disabled 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 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")
> Signed-off-by: Guilherme G. Piccoli <gpiccoli at linux.vnet.ibm.com>
> arch/powerpc/kernel/pci_of_scan.c | 3 +++
> 1 file changed, 3 insertions(+)
> diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c
> index 42e02a2..0e920f3 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);
> + /* Disable MSI/MSI-X here to avoid bogus interrupts */
> + pci_msi_setup_pci_dev(dev);
of_create_pci_dev() already has a lot of code that duplicates
pci_setup_device(), and it's a shame to add more. There's also a sparc
version of of_create_pci_dev() that presumably has the same problem you're
fixing for powerpc.
Michael originally called pci_msi_setup_pci_dev() from
pci_init_capabilities() . A subsequent patch moved the call
to pci_setup_device()  because an early quirk (called from
pci_setup_device()) used pci_msi_off(), which depended on
But we later removed pci_msi_off() completely, so I think we probably
*could* call pci_msi_setup_pci_dev() from pci_init_capabilities().
That would be much nicer because it makes more sense there, and it
would do the right thing for powerpc and sparc because they both
already use that path.
Can you look into moving the call?
> return dev;
More information about the Linuxppc-dev