From e26438478f565d3b64fa0dddfa85e932b2fa9b75 Mon Sep 17 00:00:00 2001 From: Philippe Gerum Date: Mon, 22 Jun 2009 18:24:18 +0200 Subject: [PATCH] --- yaml --- r: 162678 b: refs/heads/master c: 70f47202320623270f327e249df0121c09e45c09 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/blackfin/mach-common/interrupt.S | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 54c0a0410157..4e29c6f36e2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc9afb997f3e871d1c289258d59b48db30984950 +refs/heads/master: 70f47202320623270f327e249df0121c09e45c09 diff --git a/trunk/arch/blackfin/mach-common/interrupt.S b/trunk/arch/blackfin/mach-common/interrupt.S index ae7fc88ab6a0..29fbf67f47fa 100644 --- a/trunk/arch/blackfin/mach-common/interrupt.S +++ b/trunk/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: