diff options
| author | Grant Likely <grant.likely@linaro.org> | 2013-05-29 03:10:53 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2013-06-10 11:52:09 +0100 |
| commit | 5e1cda5b8ae93f5f02e8c5a30390ac9b4d2c20e6 (patch) | |
| tree | 03335938a58111493e457645eab35444792ff87a | |
| parent | 5e8bd41abb24a3189119233e33c5dfecfad46cb3 (diff) | |
| download | linux-stable-5e1cda5b8ae93f5f02e8c5a30390ac9b4d2c20e6.tar.gz linux-stable-5e1cda5b8ae93f5f02e8c5a30390ac9b4d2c20e6.tar.bz2 linux-stable-5e1cda5b8ae93f5f02e8c5a30390ac9b4d2c20e6.zip | |
irqdomain: Relax failure path on setting up mappings
Commit 98aa468e, "irqdomain: Support for static IRQ mapping and
association" introduced an API for directly associating blocks of hwirqs
to linux irqs. However, if any irq in that block failed to map (say if
the mapping functions returns an error because the irq is already
mapped) then the whole thing will fail and roll back. This is probably
too aggressive since there are valid reasons why a mapping may fail.
ie. Firmware may have a particular IRQ marked as unusable.
This patch drops the error path out of irq_domain_associate(). If a
mapping fails, then it is simply skipped. There is no reason to fail the
entire allocation.
v2: Still output an information message on failed mappings and make sure
attempted mapping gets cleared out of the irq_data structure.
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | kernel/irq/irqdomain.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 20b677dd0b27..61d6d3c80fee 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -464,23 +464,15 @@ int irq_domain_associate_many(struct irq_domain *domain, unsigned int irq_base, /* * If map() returns -EPERM, this interrupt is protected * by the firmware or some other service and shall not - * be mapped. - * - * Since on some platforms we blindly try to map everything - * we end up with a log full of backtraces. - * - * So instead, we silently fail on -EPERM, it is the - * responsibility of the PIC driver to display a relevant - * message if needed. + * be mapped. Don't bother telling the user about it. */ if (ret != -EPERM) { - pr_err("irq-%i==>hwirq-0x%lx mapping failed: %d\n", - virq, hwirq, ret); - WARN_ON(1); + pr_info("%s didn't like hwirq-0x%lx to VIRQ%i mapping (rc=%d)\n", + of_node_full_name(domain->of_node), hwirq, virq, ret); } irq_data->domain = NULL; irq_data->hwirq = 0; - goto err_unmap; + continue; } } |