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

Commit 4941b8f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-4.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:
 "Fix MSI/MSI-X on pseries from Guilherme"

* tag 'powerpc-4.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/PCI: Disable MSI/MSI-X interrupts at PCI probe time in OF case
  PCI: Make pci_msi_setup_pci_dev() non-static for use by arch code
parents e001d708 4d9aac39

arch/powerpc/kernel/pci_of_scan.c

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

drivers/pci/probe.c

+1 −1
Original line number Diff line number Diff line
@@ -1108,7 +1108,7 @@ int pci_cfg_space_size(struct pci_dev *dev) 


#define LEGACY_IO_RESOURCE	(IORESOURCE_IO | IORESOURCE_PCI_FIXED)



static void pci_msi_setup_pci_dev(struct pci_dev *dev)

void pci_msi_setup_pci_dev(struct pci_dev *dev)

{

	/*

	 * Disable the MSI hardware to avoid screaming interrupts

include/linux/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -1202,6 +1202,7 @@ struct msix_entry { 
	u16	entry;	/* driver uses to specify entry, OS writes */

};



void pci_msi_setup_pci_dev(struct pci_dev *dev);



#ifdef CONFIG_PCI_MSI

int pci_msi_vec_count(struct pci_dev *dev);