ppc: Disable IRQ probe on ppc

PATCH New Benjamin Herrenschmidt 1 participant 1 message Oct 22, 2004 IRQ

lore

Share & tools

lore

Benjamin Herrenschmidt

author

2004-10-22 02:19 UTC #0 lore raw

PATCH 1/1 ppc: Disable IRQ probe on ppc

Hi !

The current "generic" implementation of IRQ probing isn't well suited for ppc in it's current form, and causes issues with yenta_socket (and possibly others) on pmac laptops. We didn't have a probe implementation in the past, we probably don't need one anyway, so for now, the fix is to make this optional and enable it on x86 and x86_64 but not ppc and ppc64 (the 4 archs to use the generic IRQ code).

Signed-off-by Benjamin Herrenschmidt <[email protected]>

kernel/irq/Makefile +2 -1

Index: linux-work/kernel/irq/Makefile
===================================================================
@@ -1,4 +1,5 @@
 
-obj-y := autoprobe.o handle.o manage.o spurious.o
+obj-y := handle.o manage.o spurious.o
+obj-$(CONFIG_GENERIC_IRQ_PROBE) += autoprobe.o
 obj-$(CONFIG_PROC_FS) += proc.o

include/linux/interrupt.h +16 -0

Index: linux-work/include/linux/interrupt.h
===================================================================
@@ -252,8 +252,24 @@
  * or zero if none occurred, or a negative irq number
  * if more than one irq occurred.
  */
+
+#if defined(CONFIG_GENERIC_HARDIRQS) && !defined(CONFIG_GENERIC_IRQ_PROBE) 
+static inline unsigned long probe_irq_on(void)
+{
+	return 0;
+}
+static inline int probe_irq_off(unsigned long val)
+{
+	return 0;
+}
+static inline unsigned int probe_irq_mask(unsigned long val)
+{
+	return 0;
+}
+#else
 extern unsigned long probe_irq_on(void);	/* returns 0 on failure */
 extern int probe_irq_off(unsigned long);	/* returns 0 or negative on failure */
 extern unsigned int probe_irq_mask(unsigned long);	/* returns mask of ISA interrupts */
+#endif
 
 #endif

arch/x86_64/Kconfig +4 -0

Index: linux-work/arch/x86_64/Kconfig
===================================================================
@@ -346,6 +346,10 @@
 	bool
 	default y
 
+config GENERIC_IRQ_PROBE
+	bool
+	default y
+
 menu "Power management options"
 
 source kernel/power/Kconfig

arch/i386/Kconfig +4 -0

Index: linux-work/arch/i386/Kconfig
===================================================================
@@ -1207,6 +1207,10 @@
 	bool
 	default y
 
+config GENERIC_IRQ_PROBE
+	bool
+	default y
+
 config X86_SMP
 	bool
 	depends on SMP && !X86_VOYAGER