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

Commit a8db8cf0 authored by Grant Likely's avatar Grant Likely
Browse files

irq_domain: Replace irq_alloc_host() with revmap-specific initializers 



Each revmap type has different arguments for setting up the revmap.
This patch splits up the generator functions so that each revmap type
can do its own setup and the user doesn't need to keep track of how
each revmap type handles the arguments.

This patch also adds a host_data argument to the generators.  There are
cases where the host_data pointer will be needed before the function returns.
ie. the legacy map calls the .map callback for each irq before returning.

v2: - Add void *host_data argument to irq_domain_add_*() functions
    - fixed failure to compile
    - Moved IRQ_DOMAIN_MAP_* defines into irqdomain.c

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Milton Miller <miltonm@bga.com>
Tested-by: default avatarOlof Johansson <olof@lixom.net>
parent 68700650

arch/powerpc/platforms/512x/mpc5121_ads_cpld.c

+1 −2
Original line number Diff line number Diff line
@@ -190,8 +190,7 @@ mpc5121_ads_cpld_pic_init(void) 


	cpld_pic_node = of_node_get(np);



	cpld_pic_host =

	    irq_alloc_host(np, IRQ_DOMAIN_MAP_LINEAR, 16, &cpld_pic_host_ops, 16);

	cpld_pic_host = irq_domain_add_linear(np, 16, &cpld_pic_host_ops, NULL);

	if (!cpld_pic_host) {

		printk(KERN_ERR "CPLD PIC: failed to allocate irq host!\n");

		goto end;

arch/powerpc/platforms/52xx/media5200.c

+2 −5
Original line number Diff line number Diff line
@@ -173,15 +173,12 @@ static void __init media5200_init_irq(void) 


	spin_lock_init(&media5200_irq.lock);



	media5200_irq.irqhost = irq_alloc_host(fpga_np, IRQ_DOMAIN_MAP_LINEAR,

					       MEDIA5200_NUM_IRQS,

					       &media5200_irq_ops, -1);

	media5200_irq.irqhost = irq_domain_add_linear(fpga_np,

			MEDIA5200_NUM_IRQS, &media5200_irq_ops, &media5200_irq);

	if (!media5200_irq.irqhost)

		goto out;

	pr_debug("%s: allocated irqhost\n", __func__);



	media5200_irq.irqhost->host_data = &media5200_irq;



	irq_set_handler_data(cascade_virq, &media5200_irq);

	irq_set_chained_handler(cascade_virq, media5200_irq_cascade);

arch/powerpc/platforms/52xx/mpc52xx_gpt.c

+2 −4
Original line number Diff line number Diff line
@@ -252,14 +252,12 @@ mpc52xx_gpt_irq_setup(struct mpc52xx_gpt_priv *gpt, struct device_node *node) 
	if (!cascade_virq)

		return;



	gpt->irqhost = irq_alloc_host(node, IRQ_DOMAIN_MAP_LINEAR, 1,

				      &mpc52xx_gpt_irq_ops, -1);

	gpt->irqhost = irq_domain_add_linear(node, 1, &mpc52xx_gpt_irq_ops, gpt);

	if (!gpt->irqhost) {

		dev_err(gpt->dev, "irq_alloc_host() failed\n");

		dev_err(gpt->dev, "irq_domain_add_linear() failed\n");

		return;

	}



	gpt->irqhost->host_data = gpt;

	irq_set_handler_data(cascade_virq, gpt);

	irq_set_chained_handler(cascade_virq, mpc52xx_gpt_irq_cascade);

arch/powerpc/platforms/52xx/mpc52xx_pic.c

+2 −2
Original line number Diff line number Diff line
@@ -444,9 +444,9 @@ void __init mpc52xx_init_irq(void) 
	 * As last step, add an irq host to translate the real

	 * hw irq information provided by the ofw to linux virq

	 */

	mpc52xx_irqhost = irq_alloc_host(picnode, IRQ_DOMAIN_MAP_LINEAR,

	mpc52xx_irqhost = irq_domain_add_linear(picnode,

	                                 MPC52xx_IRQ_HIGHTESTHWIRQ,

	                                 &mpc52xx_irqhost_ops, -1);

	                                 &mpc52xx_irqhost_ops, NULL);



	if (!mpc52xx_irqhost)

		panic(__FILE__ ": Cannot allocate the IRQ host\n");

arch/powerpc/platforms/82xx/pq2ads-pci-pic.c

+1 −5
Original line number Diff line number Diff line
@@ -156,17 +156,13 @@ int __init pq2ads_pci_init_irq(void) 
	out_be32(&priv->regs->mask, ~0);

	mb();



	host = irq_alloc_host(np, IRQ_DOMAIN_MAP_LINEAR, NUM_IRQS,

	                      &pci_pic_host_ops, NUM_IRQS);

	host = irq_domain_add_linear(np, NUM_IRQS, &pci_pic_host_ops, priv);

	if (!host) {

		ret = -ENOMEM;

		goto out_unmap_regs;

	}



	host->host_data = priv;



	priv->host = host;

	host->host_data = priv;

	irq_set_handler_data(irq, priv);

	irq_set_chained_handler(irq, pq2ads_pci_irq_demux);