Changeset 93d8022 in mainline for kernel/arch/arm32/src/cpu/cpu.c

Timestamp:

2015-10-26T21:12:57Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5783d10

Parents:

1a2a6e7

Message:

ARM cache handling fixes

• boot: Use the normal outer and inner WBWA attribute also for ARMv6
• kernel: Fix comment in page_armv6.h:set_pt_level0_flags(). TEX=5, C=0, B=1 encodes outer and inner WBWA normal memory.
• Treat all normal memory as non shareable also on ARMv6.
• Make sure D$ is invalidated in cpu_arch_init() before it is enabled.
• For non-cacheable ARMv6+ memory, use device memory type instead of strongly-ordered.
• For ARMv5-, use either cached/buffered (CB=0b11) or uncached/unbuffered (CB=0b00).

File:

• kernel/arch/arm32/src/cpu/cpu.c (modified) (2 diffs)

kernel/arch/arm32/src/cpu/cpu.c

@@ -130 +130 @@
 {
         uint32_t control_reg = SCTLR_read();
-        
+
+        dcache_invalidate();
+        read_barrier();
+
         /* Turn off tex remap, RAZ/WI prior to armv7 */
         control_reg &= ~SCTLR_TEX_REMAP_EN_FLAG;
@@ -341 +344 @@
 #endif
 
+void dcache_invalidate(void)
+{
+#if defined(PROCESSOR_ARCH_armv7_a)
+        dcache_flush_invalidate();
+#else
+        if (cache_is_unified())
+                CIALL_write(0);
+        else
+                DCIALL_write(0);
+#endif
+}
+
 void dcache_clean_mva_pou(uintptr_t mva)
 {