Skip to content

Commit

Permalink
irqdomain: Improve diagnostics when a domain mapping fails
Browse files Browse the repository at this point in the history
When the map operation fails log the error code we get and add a WARN_ON()
so we get a backtrace (which should help work out which interrupt is the
source of the issue).

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
  • Loading branch information
Mark Brown authored and Grant Likely committed Jul 25, 2012
1 parent 4c0946c commit f5a1ad0
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions kernel/irq/irqdomain.c
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ int irq_domain_associate_many(struct irq_domain *domain, unsigned int irq_base,
{
unsigned int virq = irq_base;
irq_hw_number_t hwirq = hwirq_base;
int i;
int i, ret;

pr_debug("%s(%s, irqbase=%i, hwbase=%i, count=%i)\n", __func__,
of_node_full_name(domain->of_node), irq_base, (int)hwirq_base, count);
Expand All @@ -436,11 +436,16 @@ int irq_domain_associate_many(struct irq_domain *domain, unsigned int irq_base,

irq_data->hwirq = hwirq;
irq_data->domain = domain;
if (domain->ops->map && domain->ops->map(domain, virq, hwirq)) {
pr_err("irq-%i==>hwirq-0x%lx mapping failed\n", virq, hwirq);
irq_data->domain = NULL;
irq_data->hwirq = 0;
goto err_unmap;
if (domain->ops->map) {
ret = domain->ops->map(domain, virq, hwirq);
if (ret != 0) {
pr_err("irq-%i==>hwirq-0x%lx mapping failed: %d\n",
virq, hwirq, ret);
WARN_ON(1);
irq_data->domain = NULL;
irq_data->hwirq = 0;
goto err_unmap;
}
}

switch (domain->revmap_type) {
Expand Down

0 comments on commit f5a1ad0

Please sign in to comment.