Skip to content

Commit

Permalink
irqdomain: Do irq_find_mapping and set_type for hierarchy irqdomain i…
Browse files Browse the repository at this point in the history
…n case OF

It is possible to call irq_create_of_mapping to create/translate the
same IRQ from DT for multiple times. Perform irq_find_mapping check
and set_type for hierarchy irqdomain in irq_create_of_mapping() to
avoid duplicate these functionality in all outer most irqdomain.

Signed-off-by: Yingjoe Chen <[email protected]>
Signed-off-by: Jiang Liu <[email protected]>
Cc: Bjorn Helgaas <[email protected]>
Cc: Grant Likely <[email protected]>
Cc: Marc Zyngier <[email protected]>
Cc: Yingjoe Chen <[email protected]>
Cc: Yijing Wang <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
  • Loading branch information
yingjoe authored and KAGA-KOKO committed Nov 23, 2014
1 parent f8264e3 commit 0cc01ab
Showing 1 changed file with 18 additions and 9 deletions.
27 changes: 18 additions & 9 deletions kernel/irq/irqdomain.c
Original file line number Diff line number Diff line change
Expand Up @@ -478,11 +478,6 @@ unsigned int irq_create_of_mapping(struct of_phandle_args *irq_data)
return 0;
}

if (irq_domain_is_hierarchy(domain)) {
virq = irq_domain_alloc_irqs(domain, 1, NUMA_NO_NODE, irq_data);
return virq <= 0 ? 0 : virq;
}

/* If domain has no translation, then we assume interrupt line */
if (domain->ops->xlate == NULL)
hwirq = irq_data->args[0];
Expand All @@ -492,10 +487,24 @@ unsigned int irq_create_of_mapping(struct of_phandle_args *irq_data)
return 0;
}

/* Create mapping */
virq = irq_create_mapping(domain, hwirq);
if (!virq)
return virq;
if (irq_domain_is_hierarchy(domain)) {
/*
* If we've already configured this interrupt,
* don't do it again, or hell will break loose.
*/
virq = irq_find_mapping(domain, hwirq);
if (virq)
return virq;

virq = irq_domain_alloc_irqs(domain, 1, NUMA_NO_NODE, irq_data);
if (virq <= 0)
return 0;
} else {
/* Create mapping */
virq = irq_create_mapping(domain, hwirq);
if (!virq)
return virq;
}

/* Set type if specified and different than the current one */
if (type != IRQ_TYPE_NONE &&
Expand Down

0 comments on commit 0cc01ab

Please sign in to comment.