1 files changed, 256 insertions, 40 deletions

diff --git a/arch/blackfin/include/asm/irq.h b/arch/blackfin/include/asm/irq.h
index 89f59e18af93..3d977909ce7d 100644
--- a/arch/blackfin/include/asm/irq.h
+++ b/arch/blackfin/include/asm/irq.h
@@ -17,56 +17,272 @@
 #ifndef _BFIN_IRQ_H_
 #define _BFIN_IRQ_H_
 
+/* SYS_IRQS and NR_IRQS are defined in <mach-bf5xx/irq.h>*/
 #include <mach/irq.h>
-#include <asm/ptrace.h>
-
-/*******************************************************************************
- *****   INTRODUCTION ***********
- *   On the Blackfin, the interrupt structure allows remmapping of the hardware
- *   levels.
- * - I'm going to assume that the H/W level is going to stay at the default
- *   settings. If someone wants to go through and abstart this out, feel free
- *   to mod the interrupt numbering scheme.
- * - I'm abstracting the interrupts so that uClinux does not know anything
- *   about the H/W levels. If you want to change the H/W AND keep the abstracted
- *   levels that uClinux sees, you should be able to do most of it here.
- * - I've left the "abstract" numbering sparce in case someone wants to pull the
- *   interrupts apart (just the TX/RX for the various devices)
- *******************************************************************************/
+#include <asm/pda.h>
+#include <asm/processor.h>
 
-/* SYS_IRQS and NR_IRQS are defined in <mach-bf5xx/irq.h>*/
+#ifdef CONFIG_SMP
+/* Forward decl needed due to cdef inter dependencies */
+static inline uint32_t __pure bfin_dspid(void);
+# define blackfin_core_id() (bfin_dspid() & 0xff)
+# define bfin_irq_flags cpu_pda[blackfin_core_id()].imask
+#else
+extern unsigned long bfin_irq_flags;
+#endif
 
-/*
- * Machine specific interrupt sources.
- *
- * Adding an interrupt service routine for a source with this bit
- * set indicates a special machine specific interrupt source.
- * The machine specific files define these sources.
- *
- * The IRQ_MACHSPEC bit is now gone - the only thing it did was to
- * introduce unnecessary overhead.
- *
- * All interrupt handling is actually machine specific so it is better
- * to use function pointers, as used by the Sparc port, and select the
- * interrupt handling functions when initializing the kernel. This way
- * we save some unnecessary overhead at run-time.
- *                                                      01/11/97 - Jes
- */
+#ifdef CONFIG_IPIPE
+
+#include <linux/ipipe_trace.h>
+
+void __ipipe_unstall_root(void);
+
+void __ipipe_restore_root(unsigned long flags);
+
+#ifdef CONFIG_DEBUG_HWERR
+# define __all_masked_irq_flags 0x3f
+# define __save_and_cli_hw(x) \
+        __asm__ __volatile__( \
+                "cli %0;" \
+                "sti %1;" \
+                : "=&d"(x) \
+                : "d" (0x3F) \
+        )
+#else
+# define __all_masked_irq_flags 0x1f
+# define __save_and_cli_hw(x) \
+        __asm__ __volatile__( \
+                "cli %0;" \
+                : "=&d"(x) \
+        )
+#endif
+
+#define irqs_enabled_from_flags_hw(x)   ((x) != __all_masked_irq_flags)
+#define raw_irqs_disabled_flags(flags)  (!irqs_enabled_from_flags_hw(flags))
+#define local_test_iflag_hw(x)          irqs_enabled_from_flags_hw(x)
 
-extern void ack_bad_irq(unsigned int irq);
+#define local_save_flags(x)                                             \
+        do {                                                            \
+                (x) = __ipipe_test_root() ? \
+                        __all_masked_irq_flags : bfin_irq_flags; \
+        } while (0)
 
-static __inline__ int irq_canonicalize(int irq)
+#define local_irq_save(x)                               \
+        do {                                            \
+                (x) = __ipipe_test_and_stall_root();    \
+        } while (0)
+
+#define local_irq_restore(x)    __ipipe_restore_root(x)
+#define local_irq_disable()     __ipipe_stall_root()
+#define local_irq_enable()      __ipipe_unstall_root()
+#define irqs_disabled()         __ipipe_test_root()
+
+#define local_save_flags_hw(x) \
+        __asm__ __volatile__( \
+                "cli %0;" \
+                "sti %0;" \
+                : "=d"(x) \
+        )
+
+#define irqs_disabled_hw()                              \
+        ({                                              \
+                unsigned long flags;                    \
+                local_save_flags_hw(flags);             \
+                !irqs_enabled_from_flags_hw(flags);     \
+        })
+
+static inline unsigned long raw_mangle_irq_bits(int virt, unsigned long real)
 {
-        return irq;
+        /* Merge virtual and real interrupt mask bits into a single
+           32bit word. */
+        return (real & ~(1 << 31)) | ((virt != 0) << 31);
+}
+
+static inline int raw_demangle_irq_bits(unsigned long *x)
+{
+        int virt = (*x & (1 << 31)) != 0;
+        *x &= ~(1L << 31);
+        return virt;
 }
 
-/* count of spurious interrupts */
-/* extern volatile unsigned int num_spurious; */
+#ifdef CONFIG_IPIPE_TRACE_IRQSOFF
+
+#define local_irq_disable_hw()                                          \
+        do {                                                            \
+                int _tmp_dummy;                                         \
+                if (!irqs_disabled_hw())                                \
+                        ipipe_trace_begin(0x80000000);                  \
+                __asm__ __volatile__ ("cli %0;" : "=d" (_tmp_dummy) : );        \
+        } while (0)
+
+#define local_irq_enable_hw()                                           \
+        do {                                                            \
+                if (irqs_disabled_hw())                                 \
+                        ipipe_trace_end(0x80000000);                    \
+                __asm__ __volatile__ ("sti %0;" : : "d"(bfin_irq_flags));       \
+        } while (0)
+
+#define local_irq_save_hw(x)                            \
+        do {                                            \
+                __save_and_cli_hw(x);                   \
+                if (local_test_iflag_hw(x))             \
+                        ipipe_trace_begin(0x80000001);  \
+        } while (0)
+
+#define local_irq_restore_hw(x)                         \
+        do {                                            \
+                if (local_test_iflag_hw(x)) {           \
+                        ipipe_trace_end(0x80000001);    \
+                        local_irq_enable_hw_notrace();  \
+                }                                       \
+        } while (0)
+
+#define local_irq_disable_hw_notrace()                                  \
+        do {                                                            \
+                int _tmp_dummy;                                         \
+                __asm__ __volatile__ ("cli %0;" : "=d" (_tmp_dummy) : );        \
+        } while (0)
+
+#define local_irq_enable_hw_notrace() \
+        __asm__ __volatile__( \
+                "sti %0;" \
+                : \
+                : "d"(bfin_irq_flags) \
+        )
 
-#ifndef NO_IRQ
-#define NO_IRQ ((unsigned int)(-1))
+#define local_irq_save_hw_notrace(x) __save_and_cli_hw(x)
+
+#define local_irq_restore_hw_notrace(x)                 \
+        do {                                            \
+                if (local_test_iflag_hw(x))             \
+                        local_irq_enable_hw_notrace();  \
+        } while (0)
+
+#else /* CONFIG_IPIPE_TRACE_IRQSOFF */
+
+#define local_irq_enable_hw() \
+        __asm__ __volatile__( \
+                "sti %0;" \
+                : \
+                : "d"(bfin_irq_flags) \
+        )
+
+#define local_irq_disable_hw()                  \
+        do {                                    \
+                int _tmp_dummy;                 \
+                __asm__ __volatile__ (          \
+                        "cli %0;"               \
+                        : "=d" (_tmp_dummy));   \
+        } while (0)
+
+#define local_irq_restore_hw(x) \
+        do { \
+                if (irqs_enabled_from_flags_hw(x)) \
+                        local_irq_enable_hw(); \
+        } while (0)
+
+#define local_irq_save_hw(x)            __save_and_cli_hw(x)
+
+#define local_irq_disable_hw_notrace()  local_irq_disable_hw()
+#define local_irq_enable_hw_notrace()   local_irq_enable_hw()
+#define local_irq_save_hw_notrace(x)    local_irq_save_hw(x)
+#define local_irq_restore_hw_notrace(x) local_irq_restore_hw(x)
+
+#endif  /* CONFIG_IPIPE_TRACE_IRQSOFF */
+
+#else /* !CONFIG_IPIPE */
+
+/*
+ * Interrupt configuring macros.
+ */
+#define local_irq_disable() \
+        do { \
+                int __tmp_dummy; \
+                __asm__ __volatile__( \
+                        "cli %0;" \
+                        : "=d" (__tmp_dummy) \
+                ); \
+        } while (0)
+
+#define local_irq_enable() \
+        __asm__ __volatile__( \
+                "sti %0;" \
+                : \
+                : "d" (bfin_irq_flags) \
+        )
+
+#ifdef CONFIG_DEBUG_HWERR
+# define __save_and_cli(x) \
+        __asm__ __volatile__( \
+                "cli %0;" \
+                "sti %1;" \
+                : "=&d" (x) \
+                : "d" (0x3F) \
+        )
+#else
+# define __save_and_cli(x) \
+        __asm__ __volatile__( \
+                "cli %0;" \
+                : "=&d" (x) \
+        )
 #endif
 
-#define SIC_SYSIRQ(irq) (irq - (IRQ_CORETMR + 1))
+#define local_save_flags(x) \
+        __asm__ __volatile__( \
+                "cli %0;" \
+                "sti %0;" \
+                : "=d" (x) \
+        )
+
+#ifdef CONFIG_DEBUG_HWERR
+#define irqs_enabled_from_flags(x) (((x) & ~0x3f) != 0)
+#else
+#define irqs_enabled_from_flags(x) ((x) != 0x1f)
+#endif
+
+#define local_irq_restore(x) \
+        do { \
+                if (irqs_enabled_from_flags(x)) \
+                        local_irq_enable(); \
+        } while (0)
+
+/* For spinlocks etc */
+#define local_irq_save(x) __save_and_cli(x)
+
+#define irqs_disabled()                         \
+({                                              \
+        unsigned long flags;                    \
+        local_save_flags(flags);                \
+        !irqs_enabled_from_flags(flags);        \
+})
+
+#define local_irq_save_hw(x)            local_irq_save(x)
+#define local_irq_restore_hw(x)         local_irq_restore(x)
+#define local_irq_enable_hw()           local_irq_enable()
+#define local_irq_disable_hw()          local_irq_disable()
+#define irqs_disabled_hw()              irqs_disabled()
+
+#endif /* !CONFIG_IPIPE */
+
+#if ANOMALY_05000244 && defined(CONFIG_BFIN_ICACHE)
+# define NOP_PAD_ANOMALY_05000244 "nop; nop;"
+#else
+# define NOP_PAD_ANOMALY_05000244
+#endif
+
+#define idle_with_irq_disabled() \
+        __asm__ __volatile__( \
+                NOP_PAD_ANOMALY_05000244 \
+                ".align 8;" \
+                "sti %0;" \
+                "idle;" \
+                : \
+                : "d" (bfin_irq_flags) \
+        )
+
+static inline int irq_canonicalize(int irq)
+{
+        return irq;
+}
 
 #endif                          /* _BFIN_IRQ_H_ */