[rtems commit] tm27: Use generic cpu index accessor

Joel Sherrill joel at rtems.org
Fri Dec 11 21:32:25 UTC 2020


Module:    rtems
Branch:    master
Commit:    9e7b5ebd7d011ba370670feca99bf2a4ce0c47d1
Changeset: http://git.rtems.org/rtems/commit/?id=9e7b5ebd7d011ba370670feca99bf2a4ce0c47d1

Author:    Kinsey Moore <kinsey.moore at oarcorp.com>
Date:      Thu Dec 10 14:27:27 2020 -0600

tm27: Use generic cpu index accessor

The arm_cp15 function for accessing the current CPU index is specific
to ARMv7 while this header is used for ARMv8 as well. Instead, use a
generic accessor that is part of the standard CPU API.

---

 bsps/include/dev/irq/arm-gic-tm27.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bsps/include/dev/irq/arm-gic-tm27.h b/bsps/include/dev/irq/arm-gic-tm27.h
index ca3663a..fde3e63 100644
--- a/bsps/include/dev/irq/arm-gic-tm27.h
+++ b/bsps/include/dev/irq/arm-gic-tm27.h
@@ -31,7 +31,6 @@
 
 #include <bsp.h>
 #include <bsp/irq.h>
-#include <libcpu/arm-cp15.h>
 
 #define MUST_WAIT_FOR_INTERRUPT 1
 
@@ -80,7 +79,7 @@ static inline void Cause_tm27_intr(void)
 {
   rtems_status_code sc = arm_gic_irq_generate_software_irq(
     ARM_GIC_TM27_IRQ_LOW,
-    1U << (arm_cp15_get_multiprocessor_affinity() & 0xff)
+    1U << _SMP_Get_current_processor()
   );
   assert(sc == RTEMS_SUCCESSFUL);
 }
@@ -94,7 +93,7 @@ static inline void Lower_tm27_intr(void)
 {
   rtems_status_code sc = arm_gic_irq_generate_software_irq(
     ARM_GIC_TM27_IRQ_HIGH,
-    1U << (arm_cp15_get_multiprocessor_affinity() & 0xff)
+    1U << _SMP_Get_current_processor()
   );
   assert(sc == RTEMS_SUCCESSFUL);
 }



More information about the vc mailing list