Changeset 8ab339e in mainline for boot/arch/arm32/src/mm.c

Timestamp:

2013-02-26T10:58:29Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b04ca9c

Parents:

1935591 (diff), 088b334 (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:

• boot/arch/arm32/src/mm.c (modified) (6 diffs)

boot/arch/arm32/src/mm.c

@@ -38 +38 @@
 #include <arch/mm.h>
 
+/** Disable the MMU */
+static void disable_paging(void)
+{
+        asm volatile (
+                "mrc p15, 0, r0, c1, c0, 0\n"
+                "bic r0, r0, #1\n"
+                "mcr p15, 0, r0, c1, c0, 0\n"
+                ::: "r0"
+        );
+}
+
 /** Check if caching can be enabled for a given memory section.
  *
@@ -56 +67 @@
         else
                 return 1;
-#else
+#elif defined MACHINE_beagleboardxm
+        const unsigned long address = section << PTE_SECTION_SHIFT;
+        if (address >= BBXM_RAM_START && address < BBXM_RAM_END)
+                return 1;
+#elif defined MACHINE_beaglebone
+        const unsigned long address = section << PTE_SECTION_SHIFT;
+        if (address >= AM335x_RAM_START && address < AM335x_RAM_END)
+                return 1;
+#endif
         return 0;
-#endif
 }
 
@@ -85 +103 @@
         pte->tex = 0;
         pte->access_permission_1 = 0;
+        pte->shareable = 0;
         pte->non_global = 0;
         pte->should_be_zero_2 = 0;
@@ -99 +118 @@
         for (page = 0; page < split_page; page++)
                 init_ptl0_section(&boot_pt[page], page);
-        
-        /*
-         * Create 1:1 virtual-physical mapping in kernel space
-         * (upper 2 GB), physical addresses start from 0.
-         */
-        /* BeagleBoard-xM (DM37x) memory starts at 2GB border,
-         * thus mapping only lower 2GB is not not enough.
-         * Map entire AS 1:1 instead and hope it works. */
-        for (page = split_page; page < PTL0_ENTRIES; page++)
-#ifndef MACHINE_beagleboardxm
-                init_ptl0_section(&boot_pt[page], page - split_page);
-#else
-                init_ptl0_section(&boot_pt[page], page);
-#endif
         
         asm volatile (
@@ -129 +134 @@
                 "ldr r0, =0x55555555\n"
                 "mcr p15, 0, r0, c3, c0, 0\n"
-                
-#ifdef PROCESSOR_armv7_a
-                /* Read Auxiliary control register */
-                "mrc p15, 0, r0, c1, c0, 1\n"
-                /* Mask to enable L2 cache */
-                "ldr r1, =0x00000002\n"
-                "orr r0, r0, r1\n"
-                /* Store Auxiliary control register */
-                "mrc p15, 0, r0, c1, c0, 1\n"
-#endif
+
                 /* Current settings */
                 "mrc p15, 0, r0, c1, c0, 0\n"
                 
-#ifdef PROCESSOR_armv7_a
-                /* Mask to enable paging, caching */
-                "ldr r1, =0x00000005\n"
-#else
-#ifdef MACHINE_gta02
-                /* Mask to enable paging (bit 0),
-                   D-cache (bit 2), I-cache (bit 12) */
-                "ldr r1, =0x00001005\n"
-#else
-                /* Mask to enable paging */
-                "ldr r1, =0x00000001\n"
-#endif
-#endif
+                /* Enable ICache, DCache, BPredictors and MMU,
+                 * we disable caches before jumping to kernel
+                 * so this is safe for all archs.
+                 */
+                "ldr r1, =0x00001805\n"
+                
                 "orr r0, r0, r1\n"
+
+                /* Invalidate the TLB content before turning on the MMU.
+                 * ARMv7-A Reference manual, B3.10.3
+                 */
+                "mcr p15, 0, r0, c8, c7, 0\n"
                 
-                /* Store settings */
+                /* Store settings, enable the MMU */
                 "mcr p15, 0, r0, c1, c0, 0\n"
                 ::: "r0", "r1"
@@ -165 +159 @@
 /** Start the MMU - initialize page table and enable paging. */
 void mmu_start() {
+        disable_paging();
         init_boot_pt();
         enable_paging();