evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

powerpc: Add MSI operations to pci_controller_ops struct

Browse source 
Add MSI setup and teardown functions to pci_controller_ops.

Patch the callsites (arch_{setup,teardown}_msi_irqs) to prefer the
controller ops version if it's available.

Signed-off-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Daniel Axtens 2015-04-14 14:27:54 +10:00 • committed by Michael Ellerman
parent 81f2f7ce4c
commit e059b105d1
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/powerpc/include/asm/pci-bridge.h
View file

@ -30,6 +30,12 @@ struct pci_controller_ops {
/* Called during PCI resource reassignment */ /* Called during PCI resource reassignment */
resource_size_t (*window_alignment)(struct pci_bus *, unsigned long type); resource_size_t (*window_alignment)(struct pci_bus *, unsigned long type);
void (*reset_secondary_bus)(struct pci_dev *dev); void (*reset_secondary_bus)(struct pci_dev *dev);
#ifdef CONFIG_PCI_MSI
int (*setup_msi_irqs)(struct pci_dev *dev,
int nvec, int type);
void (*teardown_msi_irqs)(struct pci_dev *dev);
#endif
}; };
/* /*

14
arch/powerpc/kernel/msi.c
View file

@ -15,7 +15,11 @@
int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
{ {
if (!ppc_md.setup_msi_irqs || !ppc_md.teardown_msi_irqs) { struct pci_controller *phb = pci_bus_to_host(dev->bus);
if ((!phb->controller_ops.setup_msi_irqs ||
!phb->controller_ops.teardown_msi_irqs) &&
(!ppc_md.setup_msi_irqs || !ppc_md.teardown_msi_irqs)) {
pr_debug("msi: Platform doesn't provide MSI callbacks.\n"); pr_debug("msi: Platform doesn't provide MSI callbacks.\n");
return -ENOSYS; return -ENOSYS;
} }
@ -24,10 +28,18 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
if (type == PCI_CAP_ID_MSI && nvec > 1) if (type == PCI_CAP_ID_MSI && nvec > 1)
return 1; return 1;
if (phb->controller_ops.setup_msi_irqs)
return phb->controller_ops.setup_msi_irqs(dev, nvec, type);
else
return ppc_md.setup_msi_irqs(dev, nvec, type); return ppc_md.setup_msi_irqs(dev, nvec, type);
} }
void arch_teardown_msi_irqs(struct pci_dev *dev) void arch_teardown_msi_irqs(struct pci_dev *dev)
{ {
struct pci_controller *phb = pci_bus_to_host(dev->bus);
if (phb->controller_ops.teardown_msi_irqs)
phb->controller_ops.teardown_msi_irqs(dev);
else
ppc_md.teardown_msi_irqs(dev); ppc_md.teardown_msi_irqs(dev);
} }