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

Commit 52964f87 authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras
Browse files

[POWERPC] Add an optional device_node pointer to the irq_host 



The majority of irq_host implementations (3 out of 4) are associated
with a device_node, and need to stash it somewhere. Rather than having
it somewhere different for each host, add an optional device_node pointer
to the irq_host structure.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 0ae0b545

arch/powerpc/kernel/irq.c

+6 −4
Original line number Diff line number Diff line
@@ -418,7 +418,8 @@ irq_hw_number_t virq_to_hw(unsigned int virq) 
}

EXPORT_SYMBOL_GPL(virq_to_hw);



__init_refok struct irq_host *irq_alloc_host(unsigned int revmap_type,

__init_refok struct irq_host *irq_alloc_host(struct device_node *of_node,

				unsigned int revmap_type,

				unsigned int revmap_arg,

				struct irq_host_ops *ops,

				irq_hw_number_t inval_irq)
@@ -446,6 +447,7 @@ __init_refok struct irq_host *irq_alloc_host(unsigned int revmap_type, 
	host->revmap_type = revmap_type;

	host->inval_irq = inval_irq;

	host->ops = ops;

	host->of_node = of_node;



	spin_lock_irqsave(&irq_big_lock, flags);

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

+2 −3
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ static struct irq_chip mpc52xx_sdma_irqchip = { 
static int mpc52xx_irqhost_match(struct irq_host *h, struct device_node *node)

{

	pr_debug("%s: node=%p\n", __func__, node);

	return mpc52xx_irqhost->host_data == node;

	return h->of_node == node;

}



static int mpc52xx_irqhost_xlate(struct irq_host *h, struct device_node *ct,
@@ -419,14 +419,13 @@ void __init mpc52xx_init_irq(void) 
	 * hw irq information provided by the ofw to linux virq

	 */



	mpc52xx_irqhost = irq_alloc_host(IRQ_HOST_MAP_LINEAR,

	mpc52xx_irqhost = irq_alloc_host(picnode, IRQ_HOST_MAP_LINEAR,

	                                 MPC52xx_IRQ_HIGHTESTHWIRQ,

	                                 &mpc52xx_irqhost_ops, -1);



	if (!mpc52xx_irqhost)

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



	mpc52xx_irqhost->host_data = picnode;

	printk(KERN_INFO "MPC52xx PIC is up and running!\n");

}

arch/powerpc/platforms/82xx/mpc82xx_ads.c

+2 −5
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ static struct { 


static unsigned long pci_int_base;

static struct irq_host *pci_pic_host;

static struct device_node *pci_pic_node;

#endif



static void __init mpc82xx_ads_pic_init(void)
@@ -401,7 +400,7 @@ m82xx_pci_irq_demux(unsigned int irq, struct irq_desc *desc) 


static int pci_pic_host_match(struct irq_host *h, struct device_node *node)

{

	return node == pci_pic_node;

	return h->of_node == node;

}



static int pci_pic_host_map(struct irq_host *h, unsigned int virq,
@@ -478,7 +477,6 @@ void m82xx_pci_init_irq(void) 
		iounmap(immap);

		return;

	}

	pci_pic_node = of_node_get(np);

	/* PCI interrupt controller registers: status and mask */

	regs = of_get_property(np, "reg", &size);

	if ((!regs) || (size <= 2)) {
@@ -490,7 +488,6 @@ void m82xx_pci_init_irq(void) 
	    ioremap(regs[0], sizeof(*pci_regs.pci_int_stat_reg));

	pci_regs.pci_int_mask_reg =

	    ioremap(regs[1], sizeof(*pci_regs.pci_int_mask_reg));

	of_node_put(np);

	/* configure chip select for PCI interrupt controller */

	immap->im_memctl.memc_br3 = regs[0] | 0x00001801;

	immap->im_memctl.memc_or3 = 0xffff8010;
@@ -501,7 +498,7 @@ void m82xx_pci_init_irq(void) 
	*pci_regs.pci_int_mask_reg |= 0xfff00000;

	iounmap(immap);

	pci_pic_host =

	    irq_alloc_host(IRQ_HOST_MAP_LINEAR, irq_max - irq_min + 1,

	    irq_alloc_host(np, IRQ_HOST_MAP_LINEAR, irq_max - irq_min + 1,

			   &pci_pic_host_ops, irq_max + 1);

	return;

}

arch/powerpc/platforms/cell/axon_msi.c

+5 −9
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ 




struct axon_msic {

	struct device_node *dn;

	struct irq_host *irq_host;

	__le32 *fifo;

	dcr_host_t dcr_host;
@@ -297,9 +296,7 @@ static int msic_host_map(struct irq_host *h, unsigned int virq, 


static int msic_host_match(struct irq_host *host, struct device_node *dn)

{

	struct axon_msic *msic = host->host_data;



	return msic->dn == dn;

	return host->of_node == dn;

}



static struct irq_host_ops msic_host_ops = {
@@ -314,7 +311,8 @@ static int axon_msi_notify_reboot(struct notifier_block *nb, 
	u32 tmp;



	list_for_each_entry(msic, &axon_msic_list, list) {

		pr_debug("axon_msi: disabling %s\n", msic->dn->full_name);

		pr_debug("axon_msi: disabling %s\n",

			  msic->irq_host->of_node->full_name);

		tmp  = msic_dcr_read(msic, MSIC_CTRL_REG);

		tmp &= ~MSIC_CTRL_ENABLE & ~MSIC_CTRL_IRQ_ENABLE;

		msic_dcr_write(msic, MSIC_CTRL_REG, tmp);
@@ -370,8 +368,8 @@ static int axon_msi_setup_one(struct device_node *dn) 


	msic->fifo = page_address(page);



	msic->irq_host = irq_alloc_host(IRQ_HOST_MAP_NOMAP, NR_IRQS,

					&msic_host_ops, 0);

	msic->irq_host = irq_alloc_host(of_node_get(dn), IRQ_HOST_MAP_NOMAP,

					NR_IRQS, &msic_host_ops, 0);

	if (!msic->irq_host) {

		printk(KERN_ERR "axon_msi: couldn't allocate irq_host for %s\n",

		       dn->full_name);
@@ -387,8 +385,6 @@ static int axon_msi_setup_one(struct device_node *dn) 
		goto out_free_host;

	}



	msic->dn = of_node_get(dn);



	set_irq_data(virq, msic);

	set_irq_chained_handler(virq, axon_msi_cascade);

	pr_debug("axon_msi: irq 0x%x setup for axon_msi\n", virq);

arch/powerpc/platforms/cell/interrupt.c

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static int __init setup_iic(void) 
void __init iic_init_IRQ(void)

{

	/* Setup an irq host data structure */

	iic_host = irq_alloc_host(IRQ_HOST_MAP_LINEAR, IIC_SOURCE_COUNT,

	iic_host = irq_alloc_host(NULL, IRQ_HOST_MAP_LINEAR, IIC_SOURCE_COUNT,

				  &iic_host_ops, IIC_IRQ_INVALID);

	BUG_ON(iic_host == NULL);

	irq_set_default_host(iic_host);