Changeset bb75646 in mainline

Timestamp:

2013-08-06T23:26:54Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

face0c04

Parents:

b3f967c

Message:

arm32: Add barriers to TLB operations.

File:

• kernel/arch/arm32/src/mm/tlb.c (modified) (4 diffs)

kernel/arch/arm32/src/mm/tlb.c

@@ -40 +40 @@
 #include <typedefs.h>
 #include <arch/mm/page.h>
+#include <arch/cache.h>
 
 /** Invalidate all entries in TLB.
@@ -48 +49 @@
 {
         TLBIALL_write(0);
+        /*
+         * "A TLB maintenance operation is only guaranteed to be complete after
+         * the execution of a DSB instruction."
+         * "An ISB instruction, or a return from an exception, causes the
+         * effect of all completed TLB maintenance operations that appear in
+         * program order before the ISB or return from exception to be visible
+         * to all subsequent instructions, including the instruction fetches
+         * for those instructions."
+         * ARM Architecture reference Manual ch. B3.10.1 p. B3-1374 B3-1375
+         */
+        read_barrier();
+        inst_barrier();
 }
 
@@ -66 +79 @@
 static inline void invalidate_page(uintptr_t page)
 {
+        //TODO: What about TLBIMVAA?
         TLBIMVA_write(page);
-        //TODO: What about TLBIMVAA?
+        /*
+         * "A TLB maintenance operation is only guaranteed to be complete after
+         * the execution of a DSB instruction."
+         * "An ISB instruction, or a return from an exception, causes the
+         * effect of all completed TLB maintenance operations that appear in
+         * program order before the ISB or return from exception to be visible
+         * to all subsequent instructions, including the instruction fetches
+         * for those instructions."
+         * ARM Architecture reference Manual ch. B3.10.1 p. B3-1374 B3-1375
+         */
+        read_barrier();
+        inst_barrier();
 }
 
@@ -79 +104 @@
 void tlb_invalidate_pages(asid_t asid __attribute__((unused)), uintptr_t page, size_t cnt)
 {
-        unsigned int i;
-
-        for (i = 0; i < cnt; i++)
+        for (unsigned i = 0; i < cnt; i++)
                 invalidate_page(page + i * PAGE_SIZE);
 }