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

Commit e059b105 authored by Daniel Axtens's avatar Daniel Axtens Committed by Michael Ellerman
Browse files

powerpc: Add MSI operations to pci_controller_ops struct 



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: default avatarDaniel Axtens <dja@axtens.net>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 81f2f7ce

arch/powerpc/include/asm/pci-bridge.h

+6 −0
Original line number Diff line number Diff line
@@ -30,6 +30,12 @@ struct pci_controller_ops { 
	/* Called during PCI resource reassignment */

	resource_size_t (*window_alignment)(struct pci_bus *, unsigned long type);

	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

};



/*

arch/powerpc/kernel/msi.c

+15 −3
Original line number Diff line number Diff line
@@ -15,7 +15,11 @@ 


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");

		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)

		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);

}



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);

}