Commit d86a6d47 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

bus: fsl-mc: fsl-mc-allocator: Rework MSI handling 



Storing a pointer to the MSI descriptor just to track the Linux interrupt
number is daft. Just store the interrupt number and be done with it.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20211210221815.207838579@linutronix.de
parent d722e9a5

drivers/bus/fsl-mc/dprc-driver.c

+4 −4
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ static irqreturn_t dprc_irq0_handler_thread(int irq_num, void *arg) 
	struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev);

	struct fsl_mc_bus *mc_bus = to_fsl_mc_bus(mc_dev);

	struct fsl_mc_io *mc_io = mc_dev->mc_io;

	struct msi_desc *msi_desc = mc_dev->irqs[0]->msi_desc;

	int irq = mc_dev->irqs[0]->virq;



	dev_dbg(dev, "DPRC IRQ %d triggered on CPU %u\n",

		irq_num, smp_processor_id());
@@ -409,7 +409,7 @@ static irqreturn_t dprc_irq0_handler_thread(int irq_num, void *arg) 
		return IRQ_HANDLED;



	mutex_lock(&mc_bus->scan_mutex);

	if (!msi_desc || msi_desc->irq != (u32)irq_num)

	if (irq != (u32)irq_num)

		goto out;



	status = 0;
@@ -521,7 +521,7 @@ static int register_dprc_irq_handler(struct fsl_mc_device *mc_dev) 
	 * function that programs the MSI physically in the device

	 */

	error = devm_request_threaded_irq(&mc_dev->dev,

					  irq->msi_desc->irq,

					  irq->virq,

					  dprc_irq0_handler,

					  dprc_irq0_handler_thread,

					  IRQF_NO_SUSPEND | IRQF_ONESHOT,
@@ -771,7 +771,7 @@ static void dprc_teardown_irq(struct fsl_mc_device *mc_dev) 


	(void)disable_dprc_irq(mc_dev);



	devm_free_irq(&mc_dev->dev, irq->msi_desc->irq, &mc_dev->dev);

	devm_free_irq(&mc_dev->dev, irq->virq, &mc_dev->dev);



	fsl_mc_free_irqs(mc_dev);

}

drivers/bus/fsl-mc/fsl-mc-allocator.c

+2 −7
Original line number Diff line number Diff line
@@ -350,7 +350,6 @@ int fsl_mc_populate_irq_pool(struct fsl_mc_device *mc_bus_dev, 
			     unsigned int irq_count)

{

	unsigned int i;

	struct msi_desc *msi_desc;

	struct fsl_mc_device_irq *irq_resources;

	struct fsl_mc_device_irq *mc_dev_irq;

	int error;
@@ -388,16 +387,12 @@ int fsl_mc_populate_irq_pool(struct fsl_mc_device *mc_bus_dev, 
		mc_dev_irq->resource.type = res_pool->type;

		mc_dev_irq->resource.data = mc_dev_irq;

		mc_dev_irq->resource.parent_pool = res_pool;

		mc_dev_irq->virq = msi_get_virq(&mc_bus_dev->dev, i);

		mc_dev_irq->resource.id = mc_dev_irq->virq;

		INIT_LIST_HEAD(&mc_dev_irq->resource.node);

		list_add_tail(&mc_dev_irq->resource.node, &res_pool->free_list);

	}



	for_each_msi_entry(msi_desc, &mc_bus_dev->dev) {

		mc_dev_irq = &irq_resources[msi_desc->msi_index];

		mc_dev_irq->msi_desc = msi_desc;

		mc_dev_irq->resource.id = msi_desc->irq;

	}



	res_pool->max_count = irq_count;

	res_pool->free_count = irq_count;

	mc_bus->irq_resources = irq_resources;

drivers/bus/fsl-mc/fsl-mc-msi.c

+3 −3
Original line number Diff line number Diff line
@@ -58,11 +58,11 @@ static void fsl_mc_msi_update_dom_ops(struct msi_domain_info *info) 
}



static void __fsl_mc_msi_write_msg(struct fsl_mc_device *mc_bus_dev,

				   struct fsl_mc_device_irq *mc_dev_irq)

				   struct fsl_mc_device_irq *mc_dev_irq,

				   struct msi_desc *msi_desc)

{

	int error;

	struct fsl_mc_device *owner_mc_dev = mc_dev_irq->mc_dev;

	struct msi_desc *msi_desc = mc_dev_irq->msi_desc;

	struct dprc_irq_cfg irq_cfg;



	/*
@@ -129,7 +129,7 @@ static void fsl_mc_msi_write_msg(struct irq_data *irq_data, 
	/*

	 * Program the MSI (paddr, value) pair in the device:

	 */

	__fsl_mc_msi_write_msg(mc_bus_dev, mc_dev_irq);

	__fsl_mc_msi_write_msg(mc_bus_dev, mc_dev_irq, msi_desc);

}



static void fsl_mc_msi_update_chip_ops(struct msi_domain_info *info)

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c

+2 −2
Original line number Diff line number Diff line
@@ -4246,7 +4246,7 @@ static int dpaa2_eth_setup_irqs(struct fsl_mc_device *ls_dev) 
	}



	irq = ls_dev->irqs[0];

	err = devm_request_threaded_irq(&ls_dev->dev, irq->msi_desc->irq,

	err = devm_request_threaded_irq(&ls_dev->dev, irq->virq,

					NULL, dpni_irq0_handler_thread,

					IRQF_NO_SUSPEND | IRQF_ONESHOT,

					dev_name(&ls_dev->dev), &ls_dev->dev);
@@ -4273,7 +4273,7 @@ static int dpaa2_eth_setup_irqs(struct fsl_mc_device *ls_dev) 
	return 0;



free_irq:

	devm_free_irq(&ls_dev->dev, irq->msi_desc->irq, &ls_dev->dev);

	devm_free_irq(&ls_dev->dev, irq->virq, &ls_dev->dev);

free_mc_irq:

	fsl_mc_free_irqs(ls_dev);

drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c

+1 −3
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ static irqreturn_t dpaa2_ptp_irq_handler_thread(int irq, void *priv) 
static int dpaa2_ptp_probe(struct fsl_mc_device *mc_dev)

{

	struct device *dev = &mc_dev->dev;

	struct fsl_mc_device_irq *irq;

	struct ptp_qoriq *ptp_qoriq;

	struct device_node *node;

	void __iomem *base;
@@ -177,8 +176,7 @@ static int dpaa2_ptp_probe(struct fsl_mc_device *mc_dev) 
		goto err_unmap;

	}



	irq = mc_dev->irqs[0];

	ptp_qoriq->irq = irq->msi_desc->irq;

	ptp_qoriq->irq = mc_dev->irqs[0]->virq;



	err = request_threaded_irq(ptp_qoriq->irq, NULL,

				   dpaa2_ptp_irq_handler_thread,