layer1: Disable FIQ as well as IRQ for locking between L1S and L1A

diff --git a/src/target/firmware/include/asm/system.h b/src/target/firmware/include/asm/system.h
index 2bf0cc5..3db0dc7 100644 (file)
--- a/src/target/firmware/include/asm/system.h
+++ b/src/target/firmware/include/asm/system.h
@@ -17,6 +17,20 @@
        : "memory", "cc");                                      \
        })
        
+/* Save IRQ flags and disable FIQ + IRQ */
+#define local_firq_save(x)                                     \
+       ({                                                      \
+               unsigned long temp;                             \
+               (void) (&temp == &x);                           \
+       __asm__ __volatile__(                                   \
+       "mrs    %0, cpsr                @ local_firq_save\n"    \
+"      orr     %1, %0, #0xC0\n"                                \
+"      msr     cpsr_c, %1"                                     \
+       : "=r" (x), "=r" (temp)                                 \
+       :                                                       \
+       : "memory", "cc");                                      \
+       })
+
 /*
  * Enable IRQs
  */

diff --git a/src/target/firmware/layer1/async.c b/src/target/firmware/layer1/async.c
index 952067f..41f443a 100644 (file)
--- a/src/target/firmware/layer1/async.c
+++ b/src/target/firmware/layer1/async.c
@@ -79,7 +79,7 @@ void l1a_compl_execute(void)
        unsigned int i;
 
        /* get and reset the currently scheduled tasks */
-       local_irq_save(flags);
+       local_firq_save(flags);
        scheduled = l1s.scheduled_compl;
        l1s.scheduled_compl = 0;
        local_irq_restore(flags);

diff --git a/src/target/firmware/layer1/sync.c b/src/target/firmware/layer1/sync.c
index d991ca5..bf47643 100644 (file)
--- a/src/target/firmware/layer1/sync.c
+++ b/src/target/firmware/layer1/sync.c
@@ -200,7 +200,7 @@ void l1s_compl_sched(enum l1_compl c)
 {
        unsigned long flags;
 
-       local_irq_save(flags);
+       local_firq_save(flags);
        l1s.scheduled_compl |= (1 << c);
        local_irq_restore(flags);
 }