Skip to contentSkip to conversation

powerpc/pseries: Make request_ras_irqs() available to other pseries code

PATCH Superseded Mark Nelson 2 participants 7 messages May 17, 2010 – May 27, 2010 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/pseries: Make request_ras_irqs() available to other pseries code

At the moment only the RAS code uses event-sources interrupts (for EPOW events and internal errors) so request_ras_irqs() (which actually requests the event-sources interrupts) is found in ras.c and is static.

We want to be able to use event-sources interrupts in other pseries code, so let's rename request_ras_irqs() to request_event_sources_irqs() and move it to event_sources.c.

This will be used in an upcoming patch that adds support for IO Event interrupts that come through as event sources.

---
 arch/powerpc/platforms/pseries/Makefile        |    2 
 arch/powerpc/platforms/pseries/event_sources.c |   79 +++++++++++++++++++++++++
 arch/powerpc/platforms/pseries/event_sources.h |   29 +++++++++
 arch/powerpc/platforms/pseries/ras.c           |   63 +------------------
 4 files changed, 113 insertions(+), 60 deletions(-)
arch/powerpc/platforms/pseries/event_sources.c new file +79 -0
Index: upstream/arch/powerpc/platforms/pseries/event_sources.c
===================================================================
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2001 Dave Engebretsen IBM Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+
+#include <asm/prom.h>
+
+#include "event_sources.h"
+
+void request_event_sources_irqs(struct device_node *np,
+				irq_handler_t handler,
+				const char *name)
+{
+	int i, index, count = 0;
+	struct of_irq oirq;
+	const u32 *opicprop;
+	unsigned int opicplen;
+	unsigned int virqs[16];
+
+	/* Check for obsolete "open-pic-interrupt" property. If present, then
+	 * map those interrupts using the default interrupt host and default
+	 * trigger
+	 */
+	opicprop = of_get_property(np, "open-pic-interrupt", &opicplen);
+	if (opicprop) {
+		opicplen /= sizeof(u32);
+		for (i = 0; i < opicplen; i++) {
+			if (count > 15)
+				break;
+			virqs[count] = irq_create_mapping(NULL, *(opicprop++));
+			if (virqs[count] == NO_IRQ)
+				printk(KERN_ERR "Unable to allocate interrupt "
+				       "number for %s\n", np->full_name);
+			else
+				count++;
+
+		}
+	}
+	/* Else use normal interrupt tree parsing */
+	else {
+		/* First try to do a proper OF tree parsing */
+		for (index = 0; of_irq_map_one(np, index, &oirq) == 0;
+		     index++) {
+			if (count > 15)
+				break;
+			virqs[count] = irq_create_of_mapping(oirq.controller,
+							    oirq.specifier,
+							    oirq.size);
+			if (virqs[count] == NO_IRQ)
+				printk(KERN_ERR "Unable to allocate interrupt "
+				       "number for %s\n", np->full_name);
+			else
+				count++;
+		}
+	}
+
+	/* Now request them */
+	for (i = 0; i < count; i++) {
+		if (request_irq(virqs[i], handler, 0, name, NULL)) {
+			printk(KERN_ERR "Unable to request interrupt %d for "
+			       "%s\n", virqs[i], np->full_name);
+			return;
+		}
+	}
+}
+
arch/powerpc/platforms/pseries/event_sources.h new file +29 -0
Index: upstream/arch/powerpc/platforms/pseries/event_sources.h
===================================================================
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2001 Dave Engebretsen IBM Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+
+#ifndef _POWERPC_EVENT_SOURCES_H
+#define _POWERPC_EVENT_SOURCES_H
+
+#include <linux/interrupt.h>
+
+struct device_node;
+
+extern void request_event_sources_irqs(struct device_node *np,
+				       irq_handler_t handler, const char *name);
+
+#endif /* _POWERPC_EVENT_SOURCES_H */
arch/powerpc/platforms/pseries/Makefile +1 -1
Index: upstream/arch/powerpc/platforms/pseries/Makefile
===================================================================
@@ -7,7 +7,7 @@ EXTRA_CFLAGS		+= -DDEBUG
 endif
 
 obj-y			:= lpar.o hvCall.o nvram.o reconfig.o \
-			   setup.o iommu.o ras.o \
+			   setup.o iommu.o event_sources.o ras.o \
 			   firmware.o power.o dlpar.o
 obj-$(CONFIG_SMP)	+= smp.o
 obj-$(CONFIG_XICS)	+= xics.o
arch/powerpc/platforms/pseries/ras.c +4 -59

87 lines not on this page · raw message

#1 lore raw
Quoted 3 lines · Mark Nelson

At the moment only the RAS code uses event-sources interrupts (for EPOW events and internal errors) so request_ras_irqs() (which actually requests the event-sources interrupts) is found in ras.c and is static.

Hi Mark,

Just a few niggles,

...

Quoted 46 lines
arch/powerpc/platforms/pseries/event_sources.c new file +46 -0
+
+void request_event_sources_irqs(struct device_node *np,
+				irq_handler_t handler,
+				const char *name)
+{
+	int i, index, count = 0;
+	struct of_irq oirq;
+	const u32 *opicprop;
+	unsigned int opicplen;
+	unsigned int virqs[16];
+
+	/* Check for obsolete "open-pic-interrupt" property. If present, then
+	 * map those interrupts using the default interrupt host and default
+	 * trigger
+	 */
+	opicprop = of_get_property(np, "open-pic-interrupt", &opicplen);
+	if (opicprop) {
+		opicplen /= sizeof(u32);
+		for (i = 0; i < opicplen; i++) {
+			if (count > 15)
+				break;
+			virqs[count] = irq_create_mapping(NULL, *(opicprop++));
+			if (virqs[count] == NO_IRQ)
+				printk(KERN_ERR "Unable to allocate interrupt "
+				       "number for %s\n", np->full_name);
+			else
+				count++;
+
+		}
+	}
+	/* Else use normal interrupt tree parsing */
+	else {
+		/* First try to do a proper OF tree parsing */
+		for (index = 0; of_irq_map_one(np, index, &oirq) == 0;
+		     index++) {
+			if (count > 15)
+				break;
+			virqs[count] = irq_create_of_mapping(oirq.controller,
+							    oirq.specifier,
+							    oirq.size);
+			if (virqs[count] == NO_IRQ)
+				printk(KERN_ERR "Unable to allocate interrupt "
+				       "number for %s\n", np->full_name);
+			else
+				count++;
+		}

arch/powerpc/platforms/pseries/event_sources.c line 77

Quoted 10 lines
arch/powerpc/platforms/pseries/event_sources.c new file +10 -0
+	}
+
+	/* Now request them */
+	for (i = 0; i < count; i++) {
+		if (request_irq(virqs[i], handler, 0, name, NULL)) {
+			printk(KERN_ERR "Unable to request interrupt %d for "
+			       "%s\n", virqs[i], np->full_name);
+			return;
+		}
+	}

Existing code I know, but the error handling in here is a little lax, what's not going to work if we miss some or all of the interrupts?

Quoted 22 lines

Index: upstream/arch/powerpc/platforms/pseries/event_sources.h
===================================================================

arch/powerpc/platforms/pseries/event_sources.h new file +17 -0
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2001 Dave Engebretsen IBM Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */

arch/powerpc/platforms/pseries/event_sources.h line 27

Quoted 10 lines
arch/powerpc/platforms/pseries/event_sources.h new file +10 -0
+
+#ifndef _POWERPC_EVENT_SOURCES_H
+#define _POWERPC_EVENT_SOURCES_H
+
+#include <linux/interrupt.h>
+
+struct device_node;
+
+extern void request_event_sources_irqs(struct device_node *np,
+				       irq_handler_t handler, const char *name);

This could just go in platforms/pseries/pseries.h

arch/powerpc/platforms/pseries/ras.c line 53

Quoted 9 lines

Index: upstream/arch/powerpc/platforms/pseries/ras.c
===================================================================

arch/powerpc/platforms/pseries/ras.c +1 -0
@@ -50,6 +50,7 @@
 #include <asm/firmware.h>
 
 #include "pseries.h"
+#include "event_sources.h"

:)

cheers

#2 lore raw

Hi Michael,

Thanks for looking over these patches!

Quoted 62 lines · On Tuesday 18 May 2010 22:40:51 Michael Ellerman wrote:
Quoted 3 lines · Mark Nelson

At the moment only the RAS code uses event-sources interrupts (for EPOW events and internal errors) so request_ras_irqs() (which actually requests the event-sources interrupts) is found in ras.c and is static.

Hi Mark,

Just a few niggles,

...

Quoted 51 lines
arch/powerpc/platforms/pseries/event_sources.c new file +51 -0
+
+void request_event_sources_irqs(struct device_node *np,
+				irq_handler_t handler,
+				const char *name)
+{
+	int i, index, count = 0;
+	struct of_irq oirq;
+	const u32 *opicprop;
+	unsigned int opicplen;
+	unsigned int virqs[16];
+
+	/* Check for obsolete "open-pic-interrupt" property. If present, then
+	 * map those interrupts using the default interrupt host and default
+	 * trigger
+	 */
+	opicprop = of_get_property(np, "open-pic-interrupt", &opicplen);
+	if (opicprop) {
+		opicplen /= sizeof(u32);
+		for (i = 0; i < opicplen; i++) {
+			if (count > 15)
+				break;
+			virqs[count] = irq_create_mapping(NULL, *(opicprop++));
+			if (virqs[count] == NO_IRQ)
+				printk(KERN_ERR "Unable to allocate interrupt "
+				       "number for %s\n", np->full_name);
+			else
+				count++;
+
+		}
+	}
+	/* Else use normal interrupt tree parsing */
+	else {
+		/* First try to do a proper OF tree parsing */
+		for (index = 0; of_irq_map_one(np, index, &oirq) == 0;
+		     index++) {
+			if (count > 15)
+				break;
+			virqs[count] = irq_create_of_mapping(oirq.controller,
+							    oirq.specifier,
+							    oirq.size);
+			if (virqs[count] == NO_IRQ)
+				printk(KERN_ERR "Unable to allocate interrupt "
+				       "number for %s\n", np->full_name);
+			else
+				count++;
+		}
+	}
+
+	/* Now request them */
+	for (i = 0; i < count; i++) {
+		if (request_irq(virqs[i], handler, 0, name, NULL)) {
Quoted 8 lines

arch/powerpc/platforms/pseries/event_sources.c line 77

Quoted 5 lines
arch/powerpc/platforms/pseries/event_sources.c new file +5 -0
+			printk(KERN_ERR "Unable to request interrupt %d for "
+			       "%s\n", virqs[i], np->full_name);
+			return;
+		}
+	}

Existing code I know, but the error handling in here is a little lax, what's not going to work if we miss some or all of the interrupts?

That's a good point. For the existing code, if we miss an EPOW event it just means that the event won't be logged (as that's all we do with those events at the moment, although there is a comment saying that it should be fixed to take appropriate action depending upon the type of power failure); but it's a bigger problem if we miss one of the RAS errors because then we could miss a fatal event that we should halt the machine on. And for the upcoming IO events it's even worse as we'd miss an interrupt from the device...

I would do it in a follow-on patch rather than this one, but what would be a good course of action if we can't request the interrupt?

Quoted 27 lines
Quoted 27 lines

Index: upstream/arch/powerpc/platforms/pseries/event_sources.h
===================================================================

arch/powerpc/platforms/pseries/event_sources.h new file +21 -0
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2001 Dave Engebretsen IBM Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+
+#ifndef _POWERPC_EVENT_SOURCES_H
+#define _POWERPC_EVENT_SOURCES_H
+
Quoted 8 lines

arch/powerpc/platforms/pseries/event_sources.h line 27

Quoted 6 lines
arch/powerpc/platforms/pseries/event_sources.h new file +6 -0
+#include <linux/interrupt.h>
+
+struct device_node;
+
+extern void request_event_sources_irqs(struct device_node *np,
+				       irq_handler_t handler, const char *name);

This could just go in platforms/pseries/pseries.h

That's true - it is only one function. I'll move it.

Quoted 8 lines
Quoted 8 lines

Index: upstream/arch/powerpc/platforms/pseries/ras.c
===================================================================

arch/powerpc/platforms/pseries/ras.c +0 -0
@@ -50,6 +50,7 @@
 #include <asm/firmware.h>
 
Quoted 5 lines

arch/powerpc/platforms/pseries/ras.c line 53

Quoted 2 lines
arch/powerpc/platforms/pseries/ras.c +1 -0
 #include "pseries.h"
+#include "event_sources.h"

:)

Thanks!
Mark

#3 lore raw
Quoted 3 lines · Mark Nelson

Hi Michael,

Thanks for looking over these patches!

..

Quoted 4 lines
Quoted 3 lines

Existing code I know, but the error handling in here is a little lax, what's not going to work if we miss some or all of the interrupts?

Quoted 8 lines

That's a good point. For the existing code, if we miss an EPOW event it just means that the event won't be logged (as that's all we do with those events at the moment, although there is a comment saying that it should be fixed to take appropriate action depending upon the type of power failure); but it's a bigger problem if we miss one of the RAS errors because then we could miss a fatal event that we should halt the machine on. And for the upcoming IO events it's even worse as we'd miss an interrupt from the device...

Yeah that's what I was thinking.

Quoted 2 lines

I would do it in a follow-on patch rather than this one, but what would be a good course of action if we can't request the interrupt?

Yes a follow on patch is the way to do it.

There shouldn't be that many reasons the request fails, other than ENOMEM, or broken device tree perhaps. It's definitely worth a WARN_ON(), people notice those at least.

cheers

#4 lore raw
Quoted 20 lines · On Wednesday 19 May 2010 16:35:54 Michael Ellerman wrote:
Quoted 3 lines · Mark Nelson

Hi Michael,

Thanks for looking over these patches!

..

Quoted 4 lines
Quoted 3 lines

Existing code I know, but the error handling in here is a little lax, what's not going to work if we miss some or all of the interrupts?

Quoted 8 lines

That's a good point. For the existing code, if we miss an EPOW event it just means that the event won't be logged (as that's all we do with those events at the moment, although there is a comment saying that it should be fixed to take appropriate action depending upon the type of power failure); but it's a bigger problem if we miss one of the RAS errors because then we could miss a fatal event that we should halt the machine on. And for the upcoming IO events it's even worse as we'd miss an interrupt from the device...

Yeah that's what I was thinking.

Quoted 8 lines
Quoted 2 lines

I would do it in a follow-on patch rather than this one, but what would be a good course of action if we can't request the interrupt?

Yes a follow on patch is the way to do it.

There shouldn't be that many reasons the request fails, other than ENOMEM, or broken device tree perhaps. It's definitely worth a WARN_ON(), people notice those at least.

That sounds good. I'll do a simple follow-on patch that adds the WARN_ON().

Thanks!
Mark

#5 lore raw

PATCH v2 1/1 powerpc/pseries: Make request_ras_irqs() available to other pseries code

At the moment only the RAS code uses event-sources interrupts (for EPOW events and internal errors) so request_ras_irqs() (which actually requests the event-sources interrupts) is found in ras.c and is static.

We want to be able to use event-sources interrupts in other pseries code, so let's rename request_ras_irqs() to request_event_sources_irqs() and move it to event_sources.c.

This will be used in an upcoming patch that adds support for IO Event interrupts that come through as event sources.

---

Changes v1 -> v2:
* move the prototype for request_event_sources_irqs() to pseries.h

 arch/powerpc/platforms/pseries/Makefile        |    2 
 arch/powerpc/platforms/pseries/event_sources.c |   79 +++++++++++++++++++++++++
 arch/powerpc/platforms/pseries/pseries.h       |    7 ++
 arch/powerpc/platforms/pseries/ras.c           |   62 -------------------
 4 files changed, 90 insertions(+), 60 deletions(-)
arch/powerpc/platforms/pseries/event_sources.c new file +79 -0
Index: upstream/arch/powerpc/platforms/pseries/event_sources.c
===================================================================
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2001 Dave Engebretsen IBM Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+
+#include <asm/prom.h>
+
+#include "pseries.h"
+
+void request_event_sources_irqs(struct device_node *np,
+				irq_handler_t handler,
+				const char *name)
+{
+	int i, index, count = 0;
+	struct of_irq oirq;
+	const u32 *opicprop;
+	unsigned int opicplen;
+	unsigned int virqs[16];
+
+	/* Check for obsolete "open-pic-interrupt" property. If present, then
+	 * map those interrupts using the default interrupt host and default
+	 * trigger
+	 */
+	opicprop = of_get_property(np, "open-pic-interrupt", &opicplen);
+	if (opicprop) {
+		opicplen /= sizeof(u32);
+		for (i = 0; i < opicplen; i++) {
+			if (count > 15)
+				break;
+			virqs[count] = irq_create_mapping(NULL, *(opicprop++));
+			if (virqs[count] == NO_IRQ)
+				printk(KERN_ERR "Unable to allocate interrupt "
+				       "number for %s\n", np->full_name);
+			else
+				count++;
+
+		}
+	}
+	/* Else use normal interrupt tree parsing */
+	else {
+		/* First try to do a proper OF tree parsing */
+		for (index = 0; of_irq_map_one(np, index, &oirq) == 0;
+		     index++) {
+			if (count > 15)
+				break;
+			virqs[count] = irq_create_of_mapping(oirq.controller,
+							    oirq.specifier,
+							    oirq.size);
+			if (virqs[count] == NO_IRQ)
+				printk(KERN_ERR "Unable to allocate interrupt "
+				       "number for %s\n", np->full_name);
+			else
+				count++;
+		}
+	}
+
+	/* Now request them */
+	for (i = 0; i < count; i++) {
+		if (request_irq(virqs[i], handler, 0, name, NULL)) {
+			printk(KERN_ERR "Unable to request interrupt %d for "
+			       "%s\n", virqs[i], np->full_name);
+			return;
+		}
+	}
+}
+
arch/powerpc/platforms/pseries/Makefile +1 -1
Index: upstream/arch/powerpc/platforms/pseries/Makefile
===================================================================
@@ -7,7 +7,7 @@ EXTRA_CFLAGS		+= -DDEBUG
 endif
 
 obj-y			:= lpar.o hvCall.o nvram.o reconfig.o \
-			   setup.o iommu.o ras.o \
+			   setup.o iommu.o event_sources.o ras.o \
 			   firmware.o power.o dlpar.o
 obj-$(CONFIG_SMP)	+= smp.o
 obj-$(CONFIG_XICS)	+= xics.o
arch/powerpc/platforms/pseries/pseries.h +7 -0
Index: upstream/arch/powerpc/platforms/pseries/pseries.h
===================================================================
@@ -10,6 +10,13 @@
 #ifndef _PSERIES_PSERIES_H
 #define _PSERIES_PSERIES_H
 
+#include <linux/interrupt.h>
+
+struct device_node;
+
+extern void request_event_sources_irqs(struct device_node *np,
+				       irq_handler_t handler, const char *name);
+
 extern void __init fw_feature_init(const char *hypertas, unsigned long len);
 
 struct pt_regs;
arch/powerpc/platforms/pseries/ras.c +3 -59

80 lines not on this page · raw message

#6 lore raw

powerpc/pseries: Add WARN_ON() to request_event_sources_irqs() on irq allocation/request failure

In reply to Mark Nelson

At the moment if request_event_sources_irqs() can't allocate or request the interrupt, it just does a KERN_ERR printk. This may be fine for the existing RAS code where if we miss an EPOW event it just means that the event won't be logged and if we miss one of the RAS errors then we could miss an event that we perhaps should take action on.

But, for the upcoming IO events code that will use event-sources if we can't allocate or request the interrupt it means we'd potentially miss an interrupt from the device. So, let's add a WARN_ON() in this error case so that we're a bit more vocal when something's amiss.

While we're at it, also use pr_err() to neaten the code up a bit.

---
 arch/powerpc/platforms/pseries/event_sources.c |   23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)
arch/powerpc/platforms/pseries/event_sources.c +15 -8
Index: upstream/arch/powerpc/platforms/pseries/event_sources.c
===================================================================
@@ -41,9 +41,12 @@ void request_event_sources_irqs(struct d
 			if (count > 15)
 				break;
 			virqs[count] = irq_create_mapping(NULL, *(opicprop++));
-			if (virqs[count] == NO_IRQ)
-				printk(KERN_ERR "Unable to allocate interrupt "
-				       "number for %s\n", np->full_name);
+			if (virqs[count] == NO_IRQ) {
+				pr_err("event-sources: Unable to allocate "
+				       "interrupt number for %s\n",
+				       np->full_name);
+				WARN_ON(1);
+			}
 			else
 				count++;
 
@@ -59,9 +62,12 @@ void request_event_sources_irqs(struct d
 			virqs[count] = irq_create_of_mapping(oirq.controller,
 							    oirq.specifier,
 							    oirq.size);
-			if (virqs[count] == NO_IRQ)
-				printk(KERN_ERR "Unable to allocate interrupt "
-				       "number for %s\n", np->full_name);
+			if (virqs[count] == NO_IRQ) {
+				pr_err("event-sources: Unable to allocate "
+				       "interrupt number for %s\n",
+				       np->full_name);
+				WARN_ON(1);
+			}
 			else
 				count++;
 		}
@@ -70,8 +76,9 @@ void request_event_sources_irqs(struct d
 	/* Now request them */
 	for (i = 0; i < count; i++) {
 		if (request_irq(virqs[i], handler, 0, name, NULL)) {
-			printk(KERN_ERR "Unable to request interrupt %d for "
-			       "%s\n", virqs[i], np->full_name);
+			pr_err("event-sources: Unable to request interrupt "
+			       "%d for %s\n", virqs[i], np->full_name);
+			WARN_ON(1);
 			return;
 		}
 	}