@@ -26,11 +26,6 @@
#include <linux/string.h>
#include <linux/slab.h>
-/* For archs that don't support NO_IRQ (such as x86), provide a dummy value */
-#ifndef NO_IRQ
-#define NO_IRQ 0
-#endif
-
/**
* irq_of_parse_and_map - Parse and map an interrupt into linux virq space
* @device: Device node of the device whose interrupt is to be mapped
@@ -42,12 +37,25 @@
unsigned int irq_of_parse_and_map(struct device_node *dev, int index)
{
struct of_irq oirq;
+ int ret = 0;
if (of_irq_map_one(dev, index, &oirq))
- return NO_IRQ;
-
- return irq_create_of_mapping(oirq.controller, oirq.specifier,
- oirq.size);
+ goto no_irq;
+
+ ret = irq_create_of_mapping(oirq.controller, oirq.specifier,
+ oirq.size);
+no_irq:
+#ifdef NO_IRQ
+#if NO_IRQ != 0
+ if (ret == NO_IRQ) {
+ pr_warn("Hit NO_IRQ case for your arch. Drivers might expect "
+ "NO_IRQ, but we return 0. If anything breaks, driver "
+ "have to be fixed.\n");
+ ret = 0;
+ }
+#endif
+#endif
+ return ret;
}
EXPORT_SYMBOL_GPL(irq_of_parse_and_map);
@@ -345,7 +353,7 @@ int of_irq_to_resource(struct device_node *dev, int index, struct resource *r)
/* Only dereference the resource if both the
* resource and the irq are valid. */
- if (r && irq != NO_IRQ) {
+ if (r && irq) {
r->start = r->end = irq;
r->flags = IORESOURCE_IRQ;
r->name = dev->full_name;
@@ -363,7 +371,7 @@ int of_irq_count(struct device_node *dev)
{
int nr = 0;
- while (of_irq_to_resource(dev, nr, NULL) != NO_IRQ)
+ while (of_irq_to_resource(dev, nr, NULL))
nr++;
return nr;
@@ -383,7 +391,7 @@ int of_irq_to_resource_table(struct device_node *dev, struct resource *res,
int i;
for (i = 0; i < nr_irqs; i++, res++)
- if (of_irq_to_resource(dev, i, res) == NO_IRQ)
+ if (!of_irq_to_resource(dev, i, res))
break;
return i;
PPC32/64 defines NO_IRQ to zero, so no problems expected. ARM defines NO_IRQ to -1, but OF code relies on IRQ domains support, which returns correct ('0') value in 'no irq' case. So everything should be fine. Other arches might break if some of their OF drivers rely on NO_IRQ being not 0. If so, the drivers must be fixed, finally. Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org> --- On Fri, Dec 02, 2011 at 02:40:37PM -0800, Linus Torvalds wrote: > On Fri, Dec 2, 2011 at 2:34 PM, Anton Vorontsov > <anton.vorontsov@linaro.org> wrote: > > > > One option is to test this patch on a board that is now broken: > > > > http://lkml.org/lkml/2011/11/10/290 > > That seems broken. > > Spot the trouble: > > + ret = irq_create_of_mapping(oirq.controller, oirq.specifier, > + oirq.size); > +no_irq: > +#ifdef NO_IRQ > +#if NO_IRQ != 0 > + if (ret == NO_IRQ) > + pr_warn("Hit NO_IRQ case for your arch. Drivers might expect " > + "NO_IRQ, but we return 0. If anything breaks, driver " > + "have to be fixed.\n"); > +#endif > +#endif > + return ret; > > It claims "we return 0", but then doesn't return zero.. Hmm? > > Linus Hehe, I never claimed that I tested the patch on any OF platform. :-D But, the patch would work for ARM anyway. irq_create_of_mapping() always return 0 in case of 'no irq'. So, in ARM case the problem was in the hunk that you snipped: if (of_irq_map_one(dev, index, &oirq)) - return NO_IRQ; - For the arches that don't use IRQ domains and have NO_IRQ != 0 (e.g. microblaze), you spot the real trouble indeed. Thanks. Here is the amended fix. I hope it works, and somebody could test it. p.s. Initially I proposed a very simple band-aid fix for 3.2, and wanted the real fix postponed for 3.3 (since nowadays I don't have any OF machines to test, but this will change soon). I hope it's a good excuse. ;-) drivers/of/irq.c | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-)