Changeset 2826998 in mainline

Timestamp:

2012-12-29T23:15:40Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

949869d

Parents:

26e550c2

Message:

arm32: Enable I-Cache for arm7 in boot code.

We enable it later for kernel so to should be ok.
Cleanup comments.

Files:

• boot/arch/arm32/src/mm.c (modified) (1 diff)
• kernel/arch/arm32/include/regutils.h (modified) (1 diff)
• kernel/arch/arm32/src/cpu/cpu.c (modified) (1 diff)

boot/arch/arm32/src/mm.c

@@ -120 +120 @@
                 
 #ifdef PROCESSOR_armv7_a
-                /* Mask to enable paging, caching */
-                "ldr r1, =0x00000005\n"
+                /* Mask to enable paging, I-cache D-cache
+                 * See kernel/arch/arm32/include/regutils.h for bit values.*/
+                "ldr r1, =0x00001005\n"
 #else
                 /* Mask to enable paging */

kernel/arch/arm32/include/regutils.h

@@ -47 +47 @@
 #define CP15_R1_CACHE_EN          (1 << 2)
 #define CP15_R1_CP15_BARRIER_EN   (1 << 5)
-#define CP15_R1_B_EN              (1 << 7)  /* ARMv6- only big endian switch */
+#define CP15_R1_B_EN              (1 << 7)  /* ARMv6- only, big endian switch */
 #define CP15_R1_SWAP_EN           (1 << 10)
 #define CP15_R1_BRANCH_PREDICT_EN (1 << 11)

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

@@ -105 +105 @@
         );
         
-        /* Turn off tex remap, RAZ ignores writes prior to armv7 */
+        /* Turn off tex remap, RAZ/WI prior to armv7 */
         control_reg &= ~CP15_R1_TEX_REMAP_EN;
-        /* Turn off accessed flag, RAZ ignores writes prior to armv7 */
+        /* Turn off accessed flag, RAZ/WI prior to armv7 */
         control_reg &= ~(CP15_R1_ACCESS_FLAG_EN | CP15_R1_HW_ACCESS_FLAG_EN);
-        /* Enable unaligned access, RAZ ignores writes prior to armv6
-         * switchable on armv6, RAO ignores writes on armv7,
+        /* Enable unaligned access, RAZ/WI prior to armv6
+         * switchable on armv6, RAO/WI writes on armv7,
          * see ARM Architecture Reference Manual ARMv7-A and ARMv7-R edition
          * L.3.1 (p. 2456) */