powerpc/mpic: Add in-core support for cascaded MPICs
The Cell and PowerMac platforms use virtually identical cascaded-IRQ setup code, so just merge it into the core. Ideally this code would trigger automatically when an MPIC device-node specifies an "interrupts" property, perhaps even enabling MPIC_SECONDARY along the way. Unfortunately, Benjamin Herrenschmidt has had bad experiences in the past with the quality of Apple PowerMac device-trees, so to be safe we will only try to parse out an IRQ if the MPIC_SECONDARY flag is set by the caller. Signed-off-by: Kyle Moffett <Kyle.D.Moffett@boeing.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:

committed by
Benjamin Herrenschmidt

parent
c51242e708
commit
09dc34a95b
@@ -184,24 +184,10 @@ static int __init cell_publish_devices(void)
|
||||
}
|
||||
machine_subsys_initcall(cell, cell_publish_devices);
|
||||
|
||||
static void cell_mpic_cascade(unsigned int irq, struct irq_desc *desc)
|
||||
{
|
||||
struct irq_chip *chip = irq_desc_get_chip(desc);
|
||||
struct mpic *mpic = irq_desc_get_handler_data(desc);
|
||||
unsigned int virq;
|
||||
|
||||
virq = mpic_get_one_irq(mpic);
|
||||
if (virq != NO_IRQ)
|
||||
generic_handle_irq(virq);
|
||||
|
||||
chip->irq_eoi(&desc->irq_data);
|
||||
}
|
||||
|
||||
static void __init mpic_init_IRQ(void)
|
||||
{
|
||||
struct device_node *dn;
|
||||
struct mpic *mpic;
|
||||
unsigned int virq;
|
||||
|
||||
for (dn = NULL;
|
||||
(dn = of_find_node_by_name(dn, "interrupt-controller"));) {
|
||||
@@ -215,15 +201,6 @@ static void __init mpic_init_IRQ(void)
|
||||
if (mpic == NULL)
|
||||
continue;
|
||||
mpic_init(mpic);
|
||||
|
||||
virq = irq_of_parse_and_map(dn, 0);
|
||||
if (virq == NO_IRQ)
|
||||
continue;
|
||||
|
||||
printk(KERN_INFO "%s : hooking up to IRQ %d\n",
|
||||
dn->full_name, virq);
|
||||
irq_set_handler_data(virq, mpic);
|
||||
irq_set_chained_handler(virq, cell_mpic_cascade);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user