patch-2.1.116 linux/include/asm-alpha/irq.h

Next file: linux/include/asm-alpha/jensen.h
Previous file: linux/include/asm-alpha/io.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.115/linux/include/asm-alpha/irq.h linux/include/asm-alpha/irq.h
@@ -10,18 +10,24 @@
 #include <linux/linkage.h>
 #include <linux/config.h>
 
-#if   defined(CONFIG_ALPHA_CABRIOLET) || \
+#if   defined(CONFIG_ALPHA_GENERIC)
+
+/* Here NR_IRQS is not exact, but rather an upper bound.  This is used
+   many places throughout the kernel to size static arrays.  That's ok,
+   we'll use alpha_mv.nr_irqs when we want the real thing.  */
+
+# define NR_IRQS	64
+
+#elif defined(CONFIG_ALPHA_CABRIOLET) || \
       defined(CONFIG_ALPHA_EB66P)     || \
       defined(CONFIG_ALPHA_EB164)     || \
       defined(CONFIG_ALPHA_PC164)     || \
-	defined(CONFIG_ALPHA_LX164)
-
+      defined(CONFIG_ALPHA_LX164)
 # define NR_IRQS	35
 
 #elif defined(CONFIG_ALPHA_EB66)      || \
       defined(CONFIG_ALPHA_EB64P)     || \
-	defined(CONFIG_ALPHA_MIKASA)
-
+      defined(CONFIG_ALPHA_MIKASA)
 # define NR_IRQS	32
 
 #elif defined(CONFIG_ALPHA_ALCOR)     || \
@@ -29,29 +35,52 @@
       defined(CONFIG_ALPHA_MIATA)     || \
       defined(CONFIG_ALPHA_RUFFIAN)   || \
       defined(CONFIG_ALPHA_NORITAKE)
-
 # define NR_IRQS	48
 
 #elif defined(CONFIG_ALPHA_SABLE)     || \
       defined(CONFIG_ALPHA_SX164)
-
 # define NR_IRQS	40
 
 #elif defined(CONFIG_ALPHA_DP264) || \
       defined(CONFIG_ALPHA_RAWHIDE)
-
 # define NR_IRQS	64
 
 #elif defined(CONFIG_ALPHA_TAKARA)
-
 # define NR_IRQS	20
 
 #else /* everyone else */
-
 # define NR_IRQS	16
+#endif
 
+/*
+ * PROBE_MASK is the bitset of irqs that we consider for autoprobing.
+ */
+
+/* The normal mask includes all the IRQs except the timer.  */
+#define _PROBE_MASK(nr_irqs)	(((1UL << (nr_irqs & 63)) - 1) & ~1UL)
+
+/* Mask out unused timer irq 0 and RTC irq 8. */
+#define P2K_PROBE_MASK		(_PROBE_MASK(16) & ~0x101UL)
+
+/* Mask out unused timer irq 0, "irqs" 20-30, and the EISA cascade. */
+#define ALCOR_PROBE_MASK	(_PROBE_MASK(48) & ~0xfff000000001UL)
+
+/* Leave timer irq 0 in the mask.  */
+#define RUFFIAN_PROBE_MASK	(_PROBE_MASK(48) | 1UL)
+
+#if defined(CONFIG_ALPHA_GENERIC)
+# define PROBE_MASK	alpha_mv.irq_probe_mask
+#elif defined(CONFIG_ALPHA_P2K)
+# define PROBE_MASK	P2K_PROBE_MASK
+#elif defined(CONFIG_ALPHA_ALCOR) || defined(CONFIG_ALPHA_XLT)
+# define PROBE_MASK	ALCOR_PROBE_MASK
+#elif defined(CONFIG_ALPHA_RUFFIAN)
+# define PROBE_MASK	RUFFIAN_PROBE_MASK
+#else
+# define PROBE_MASK	_PROBE_MASK(NR_IRQS)
 #endif
 
+
 static __inline__ int irq_cannonicalize(int irq)
 {
 	/*
@@ -64,4 +93,4 @@
 extern void disable_irq(unsigned int);
 extern void enable_irq(unsigned int);
 
-#endif
+#endif /* _ALPHA_IRQ_H */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov