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

Commit fd9a1c26 authored by Ian Munsie's avatar Ian Munsie Committed by Michael Ellerman
Browse files

powerpc/powernv: Split out set MSI IRQ chip code 



Some of the MSI IRQ code in pnv_pci_ioda_msi_setup() is generically useful so
split it out.

This will be used by some of the cxl PCIe code later.

Signed-off-by: default avatarIan Munsie <imunsie@au1.ibm.com>
Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 8ca7a82f

arch/powerpc/platforms/powernv/pci-ioda.c

+24 −18
Original line number Diff line number Diff line
@@ -1327,14 +1327,35 @@ static void pnv_ioda2_msi_eoi(struct irq_data *d) 
	icp_native_eoi(d);

}





static void set_msi_irq_chip(struct pnv_phb *phb, unsigned int virq)

{

	struct irq_data *idata;

	struct irq_chip *ichip;



	if (phb->type != PNV_PHB_IODA2)

		return;



	if (!phb->ioda.irq_chip_init) {

		/*

		 * First time we setup an MSI IRQ, we need to setup the

		 * corresponding IRQ chip to route correctly.

		 */

		idata = irq_get_irq_data(virq);

		ichip = irq_data_get_irq_chip(idata);

		phb->ioda.irq_chip_init = 1;

		phb->ioda.irq_chip = *ichip;

		phb->ioda.irq_chip.irq_eoi = pnv_ioda2_msi_eoi;

	}

	irq_set_chip(virq, &phb->ioda.irq_chip);

}



static int pnv_pci_ioda_msi_setup(struct pnv_phb *phb, struct pci_dev *dev,

				  unsigned int hwirq, unsigned int virq,

				  unsigned int is_64, struct msi_msg *msg)

{

	struct pnv_ioda_pe *pe = pnv_ioda_get_pe(dev);

	struct pci_dn *pdn = pci_get_pdn(dev);

	struct irq_data *idata;

	struct irq_chip *ichip;

	unsigned int xive_num = hwirq - phb->msi_base;

	__be32 data;

	int rc;
@@ -1386,22 +1407,7 @@ static int pnv_pci_ioda_msi_setup(struct pnv_phb *phb, struct pci_dev *dev, 
	}

	msg->data = be32_to_cpu(data);



	/*

	 * Change the IRQ chip for the MSI interrupts on PHB3.

	 * The corresponding IRQ chip should be populated for

	 * the first time.

	 */

	if (phb->type == PNV_PHB_IODA2) {

		if (!phb->ioda.irq_chip_init) {

			idata = irq_get_irq_data(virq);

			ichip = irq_data_get_irq_chip(idata);

			phb->ioda.irq_chip_init = 1;

			phb->ioda.irq_chip = *ichip;

			phb->ioda.irq_chip.irq_eoi = pnv_ioda2_msi_eoi;

		}



		irq_set_chip(virq, &phb->ioda.irq_chip);

	}

	set_msi_irq_chip(phb, virq);



	pr_devel("%s: %s-bit MSI on hwirq %x (xive #%d),"

		 " address=%x_%08x data=%x PE# %d\n",