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: Ian Munsie <imunsie@au1.ibm.com> Signed-off-by: Michael Neuling <mikey@neuling.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
parent
8ca7a82f7b
commit
fd9a1c26ae
|
@ -1327,14 +1327,35 @@ static void pnv_ioda2_msi_eoi(struct irq_data *d)
|
||||||
icp_native_eoi(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,
|
static int pnv_pci_ioda_msi_setup(struct pnv_phb *phb, struct pci_dev *dev,
|
||||||
unsigned int hwirq, unsigned int virq,
|
unsigned int hwirq, unsigned int virq,
|
||||||
unsigned int is_64, struct msi_msg *msg)
|
unsigned int is_64, struct msi_msg *msg)
|
||||||
{
|
{
|
||||||
struct pnv_ioda_pe *pe = pnv_ioda_get_pe(dev);
|
struct pnv_ioda_pe *pe = pnv_ioda_get_pe(dev);
|
||||||
struct pci_dn *pdn = pci_get_pdn(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;
|
unsigned int xive_num = hwirq - phb->msi_base;
|
||||||
__be32 data;
|
__be32 data;
|
||||||
int rc;
|
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);
|
msg->data = be32_to_cpu(data);
|
||||||
|
|
||||||
/*
|
set_msi_irq_chip(phb, virq);
|
||||||
* 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);
|
|
||||||
}
|
|
||||||
|
|
||||||
pr_devel("%s: %s-bit MSI on hwirq %x (xive #%d),"
|
pr_devel("%s: %s-bit MSI on hwirq %x (xive #%d),"
|
||||||
" address=%x_%08x data=%x PE# %d\n",
|
" address=%x_%08x data=%x PE# %d\n",
|
||||||
|
|
Loading…
Reference in New Issue