[rtems commit] arm: Fix arm_cp15_set_translation_table_entries()

[Sebastian Huber]

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Sep  4 20:10:57 2020 +0200

arm: Fix arm_cp15_set_translation_table_entries()

In a multi-processor system we must broadcast the TLB maintenance operation to
the Inner Shareable domain to ensure that the other processors update their TLB
caches accordingly.

Close #4068.

---

 bsps/arm/shared/cp15/arm-cp15-set-ttb-entries.c |  2 +-
 cpukit/score/cpu/arm/include/libcpu/arm-cp15.h  | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/bsps/arm/shared/cp15/arm-cp15-set-ttb-entries.c b/bsps/arm/shared/cp15/arm-cp15-set-ttb-entries.c
index 507277d..976f87a 100644
--- a/bsps/arm/shared/cp15/arm-cp15-set-ttb-entries.c
+++ b/bsps/arm/shared/cp15/arm-cp15-set-ttb-entries.c
@@ -107,7 +107,7 @@ static uint32_t set_translation_table_entries(
     #define MPIDR_UP     (1 << 30)
     const uint32_t mpidr = arm_cp15_get_multiprocessor_affinity();
     if ((mpidr & (MPIDR_MX_FMT | MPIDR_UP)) == MPIDR_MX_FMT) {
-      arm_cp15_tlb_invalidate_entry_all_asids(mva);
+      arm_cp15_tlb_invalidate_entry_all_asids_inner_shareable(mva);
     }
     else
 #endif
diff --git a/cpukit/score/cpu/arm/include/libcpu/arm-cp15.h b/cpukit/score/cpu/arm/include/libcpu/arm-cp15.h
index 8d43ca0..6097d60 100644
--- a/cpukit/score/cpu/arm/include/libcpu/arm-cp15.h
+++ b/cpukit/score/cpu/arm/include/libcpu/arm-cp15.h
@@ -647,6 +647,22 @@ arm_cp15_tlb_invalidate_entry_all_asids(const void *mva)
 }
 
 ARM_CP15_TEXT_SECTION static inline void
+arm_cp15_tlb_invalidate_entry_all_asids_inner_shareable(const void *mva)
+{
+  ARM_SWITCH_REGISTERS;
+
+  mva = ARM_CP15_TLB_PREPARE_MVA(mva);
+
+  __asm__ volatile (
+    ARM_SWITCH_TO_ARM
+    "mcr p15, 0, %[mva], c8, c3, 3\n"
+    ARM_SWITCH_BACK
+    : ARM_SWITCH_OUTPUT
+    : [mva] "r" (mva)
+  );
+}
+
+ARM_CP15_TEXT_SECTION static inline void
 arm_cp15_tlb_instruction_invalidate(void)
 {
   ARM_SWITCH_REGISTERS;