Changeset ff381a7 in mainline for kernel/arch/arm32/include/arch/mm/page_armv6.h

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/arm32/include/arch/mm/page_armv6.h (modified) (3 diffs)

kernel/arch/arm32/include/arch/mm/page_armv6.h

@@ -156 +156 @@
 do { \
         for (unsigned i = 0; i < count; ++i) \
-                DCCMVAU_write((uintptr_t)(pt + i)); \
+                dcache_clean_mva_pou((uintptr_t)(pt + i)); \
         read_barrier(); \
 } while (0)
-
 
 /** Returns level 0 page table entry flags.
@@ -258 +257 @@
         if (flags & PAGE_CACHEABLE) {
                 /*
-                 * Write-through, write-allocate memory, see ch. B3.8.2
-                 * (p. B3-1358) of ARM Architecture reference manual.
+                 * Outer and inner write-back, write-allocate memory,
+                 * see ch. B3.8.2 (p. B3-1358) of ARM Architecture reference
+                 * manual.
+                 *
                  * Make sure the memory type is correct, and in sync with:
                  * init_boot_pt (boot/arch/arm32/src/mm.c)
@@ -278 +279 @@
         }
         
-#if defined(PROCESSOR_ARCH_armv6)
-        /* FIXME: this disables caches */
-        p->shareable = 1;
-#else
         /* Shareable is ignored for devices (non-cacheable),
          * turn it off for normal memory. */
         p->shareable = 0;
-#endif
         
         p->non_global = !(flags & PAGE_GLOBAL);