Changeset 9aff7e56 in rtems

Timestamp:

Jan 11, 2021, 4:23:16 PM (3 months ago)

Author:

Alex White <alex.white@…>

Branches:

master

Children:

07297812

Parents:

bbc9974a

git-author:

Alex White <alex.white@…> (01/11/21 16:23:16)

git-committer:

Joel Sherrill <joel@…> (03/05/21 14:43:15)

Message:

score/aarch64: Fix interrupt level reads

Location:

cpukit/score/cpu/aarch64

Files:

• cpu.c (modified) (1 diff)
• include/rtems/score/cpu.h (modified) (2 diffs)

cpukit/score/cpu/aarch64/cpu.c

@@ -167 +167 @@
   );
 
-  return level & AARCH64_PSTATE_I;
+  return ( level & AARCH64_PSTATE_I ) != 0;
 }
 

cpukit/score/cpu/aarch64/include/rtems/score/cpu.h

@@ -216 +216 @@
 static inline uint64_t AArch64_interrupt_disable( void )
 {
-  uint64_t level = _CPU_ISR_Get_level();
+  uint64_t level;
+
   __asm__ volatile (
+    "mrs %[level], DAIF\n"
     "msr DAIFSet, #0x2\n"
+    : [level] "=&r" (level)
   );
+
   return level;
 }
@@ -251 +255 @@
 RTEMS_INLINE_ROUTINE bool _CPU_ISR_Is_enabled( uint64_t level )
 {
-  return ( level & AARCH64_PSTATE_I ) == 0;
+  return level == 0;
 }