summaryrefslogtreecommitdiff
path: root/arch/blackfin/mach-common
diff options
context:
space:
mode:
authorPhilippe Gerum <rpm@xenomai.org>2009-06-22 18:24:18 +0200
committerMike Frysinger <vapier@gentoo.org>2009-09-16 21:28:37 -0400
commit70f47202320623270f327e249df0121c09e45c09 (patch)
treea7aee7d1a9a8279435b9676e2866d2e253d74193 /arch/blackfin/mach-common
parentfc9afb997f3e871d1c289258d59b48db30984950 (diff)
downloadlinux-3.10-70f47202320623270f327e249df0121c09e45c09.tar.gz
linux-3.10-70f47202320623270f327e249df0121c09e45c09.tar.bz2
linux-3.10-70f47202320623270f327e249df0121c09e45c09.zip
Blackfin: allow EVT5 to preempt irqtail prologue (CONFIG_DEBUG_HWERR)
Signed-off-by: Philippe Gerum <rpm@xenomai.org> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/mach-common')
-rw-r--r--arch/blackfin/mach-common/interrupt.S10
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/blackfin/mach-common/interrupt.S b/arch/blackfin/mach-common/interrupt.S
index ae7fc88ab6a..29fbf67f47f 100644
--- a/arch/blackfin/mach-common/interrupt.S
+++ b/arch/blackfin/mach-common/interrupt.S
@@ -276,7 +276,15 @@ ENTRY(___ipipe_call_irqtail)
( r7:4, p5:3 ) = [sp++];
rets = [sp++];
- r0 = 0x401f (z);
+#ifdef CONFIG_DEBUG_HWERR
+ /* enable irq14 & hwerr interrupt, until we transition to _evt_evt14 */
+ r0 = (EVT_IVG14 | EVT_IVHW | \
+ EVT_IRPTEN | EVT_EVX | EVT_NMI | EVT_RST | EVT_EMU);
+#else
+ /* Only enable irq14 interrupt, until we transition to _evt_evt14 */
+ r0 = (EVT_IVG14 | \
+ EVT_IRPTEN | EVT_EVX | EVT_NMI | EVT_RST | EVT_EMU);
+#endif
sti r0;
raise 14; /* Branches to _evt_evt14 */
2: