Commit 9a014f45 authored by Cédric Le Goater's avatar Cédric Le Goater Committed by Michael Ellerman
Browse files

powerpc/pseries/pci: Add a msi_free() handler to clear XIVE data 



The MSI domain clears the IRQ with msi_domain_free(), which calls
irq_domain_free_irqs_top(), which clears the handler data. This is a
problem for the XIVE controller since we need to unmap MMIO pages and
free a specific XIVE structure.

The 'msi_free()' handler is called before irq_domain_free_irqs_top()
when the handler data is still available. Use that to clear the XIVE
controller data.

Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210701132750.1475580-10-clg@kaod.org
parent 07817a57

arch/powerpc/include/asm/xive.h

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ void xive_native_free_vp_block(u32 vp_base); 
int xive_native_populate_irq_data(u32 hw_irq,

				  struct xive_irq_data *data);

void xive_cleanup_irq_data(struct xive_irq_data *xd);

void xive_irq_free_data(unsigned int virq);

void xive_native_free_irq(u32 irq);

int xive_native_configure_irq(u32 hw_irq, u32 target, u8 prio, u32 sw_irq);

arch/powerpc/platforms/pseries/msi.c

+15 −1
Original line number Diff line number Diff line
@@ -529,6 +529,19 @@ static int pseries_msi_ops_prepare(struct irq_domain *domain, struct device *dev 
	return rtas_prepare_msi_irqs(pdev, nvec, type, arg);

}



/*

 * ->msi_free() is called before irq_domain_free_irqs_top() when the

 * handler data is still available. Use that to clear the XIVE

 * controller data.

 */

static void pseries_msi_ops_msi_free(struct irq_domain *domain,

				     struct msi_domain_info *info,

				     unsigned int irq)

{

	if (xive_enabled())

		xive_irq_free_data(irq);

}



/*

 * RTAS can not disable one MSI at a time. It's all or nothing. Do it

 * at the end after all IRQs have been freed.
@@ -546,6 +559,7 @@ static void pseries_msi_domain_free_irqs(struct irq_domain *domain, 


static struct msi_domain_ops pseries_pci_msi_domain_ops = {

	.msi_prepare	= pseries_msi_ops_prepare,

	.msi_free	= pseries_msi_ops_msi_free,

	.domain_free_irqs = pseries_msi_domain_free_irqs,

};
@@ -660,7 +674,7 @@ static void pseries_irq_domain_free(struct irq_domain *domain, unsigned int virq 


	pr_debug("%s bridge %pOF %d #%d\n", __func__, phb->dn, virq, nr_irqs);



	irq_domain_free_irqs_parent(domain, virq, nr_irqs);

	/* XIVE domain data is cleared through ->msi_free() */

}



static const struct irq_domain_ops pseries_irq_domain_ops = {

arch/powerpc/sysdev/xive/common.c

+4 −1
Original line number Diff line number Diff line
@@ -975,6 +975,8 @@ EXPORT_SYMBOL_GPL(is_xive_irq); 


void xive_cleanup_irq_data(struct xive_irq_data *xd)

{

	pr_debug("%s for HW %x\n", __func__, xd->hw_irq);



	if (xd->eoi_mmio) {

		iounmap(xd->eoi_mmio);

		if (xd->eoi_mmio == xd->trig_mmio)
@@ -1016,7 +1018,7 @@ static int xive_irq_alloc_data(unsigned int virq, irq_hw_number_t hw) 
	return 0;

}



static void xive_irq_free_data(unsigned int virq)

void xive_irq_free_data(unsigned int virq)

{

	struct xive_irq_data *xd = irq_get_handler_data(virq);
@@ -1026,6 +1028,7 @@ static void xive_irq_free_data(unsigned int virq) 
	xive_cleanup_irq_data(xd);

	kfree(xd);

}

EXPORT_SYMBOL_GPL(xive_irq_free_data);



#ifdef CONFIG_SMP