tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 4941b8f0 e001d708

+5 -1
+3
arch/powerpc/kernel/pci_of_scan.c
··· 191 191 192 192 pci_device_add(dev, bus); 193 193 194 + /* Setup MSI caps & disable MSI/MSI-X interrupts */ 195 + pci_msi_setup_pci_dev(dev); 196 + 194 197 return dev; 195 198 } 196 199 EXPORT_SYMBOL(of_create_pci_dev);
+1 -1
drivers/pci/probe.c
··· 1108 1108 1109 1109 #define LEGACY_IO_RESOURCE (IORESOURCE_IO | IORESOURCE_PCI_FIXED) 1110 1110 1111 - static void pci_msi_setup_pci_dev(struct pci_dev *dev) 1111 + void pci_msi_setup_pci_dev(struct pci_dev *dev) 1112 1112 { 1113 1113 /* 1114 1114 * Disable the MSI hardware to avoid screaming interrupts
+1
include/linux/pci.h
··· 1202 1202 u16 entry; /* driver uses to specify entry, OS writes */ 1203 1203 }; 1204 1204 1205 + void pci_msi_setup_pci_dev(struct pci_dev *dev); 1205 1206 1206 1207 #ifdef CONFIG_PCI_MSI 1207 1208 int pci_msi_vec_count(struct pci_dev *dev);