Changes in boot/arch/arm32/src/mm.c [f7fba727:8f9d70b] in mainline

File:

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

boot/arch/arm32/src/mm.c

@@ -37 +37 @@
 #include <arch/asm.h>
 #include <arch/mm.h>
-#include <arch/cp15.h>
-
-#ifdef PROCESSOR_ARCH_armv7_a
-static unsigned log2(unsigned val)
-{
-        unsigned log = 0;
-        while (val >> log++);
-        return log - 2;
-}
-
-static void dcache_invalidate_level(unsigned level)
-{
-        CSSELR_write(level << 1);
-        const uint32_t ccsidr = CCSIDR_read();
-        const unsigned sets = CCSIDR_SETS(ccsidr);
-        const unsigned ways = CCSIDR_WAYS(ccsidr);
-        const unsigned line_log = CCSIDR_LINESIZE_LOG(ccsidr);
-        const unsigned set_shift = line_log;
-        const unsigned way_shift = 32 - log2(ways);
-
-        for (unsigned k = 0; k < ways; ++k)
-                for (unsigned j = 0; j < sets; ++j) {
-                        const uint32_t val = (level << 1) |
-                            (j << set_shift) | (k << way_shift);
-                        DCISW_write(val);
-                }
-}
-
-/** invalidate all dcaches -- armv7 */
-static void cache_invalidate(void)
-{
-        const uint32_t cinfo = CLIDR_read();
-        for (unsigned i = 0; i < 7; ++i) {
-                switch (CLIDR_CACHE(i, cinfo))
-                {
-                case CLIDR_DCACHE_ONLY:
-                case CLIDR_SEP_CACHE:
-                case CLIDR_UNI_CACHE:
-                        dcache_invalidate_level(i);
-                }
-        }
-        asm volatile ( "dsb\n" );
-        ICIALLU_write(0);
-        asm volatile ( "isb\n" );
-}
-#endif
 
 /** Disable the MMU */
@@ -106 +60 @@
 static inline int section_cacheable(pfn_t section)
 {
-        const unsigned long address = section << PTE_SECTION_SHIFT;
 #ifdef MACHINE_gta02
-        if (address < GTA02_IOMEM_START || address >= GTA02_IOMEM_END)
+        unsigned long address = section << PTE_SECTION_SHIFT;
+
+        if (address >= GTA02_IOMEM_START && address < GTA02_IOMEM_END)
+                return 0;
+        else
                 return 1;
 #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;
+#elif defined MACHINE_raspberrypi
+        const unsigned long address = section << PTE_SECTION_SHIFT;
+        if (address < BCM2835_RAM_END)
+                return 1;
 #endif
-        return address * 0;
+        return 0;
 }
 
@@ -136 +99 @@
 {
         pte->descriptor_type = PTE_DESCRIPTOR_SECTION;
+        pte->bufferable = 1;
+        pte->cacheable = section_cacheable(frame);
         pte->xn = 0;
         pte->domain = 0;
         pte->should_be_zero_1 = 0;
         pte->access_permission_0 = PTE_AP_USER_NO_KERNEL_RW;
-#ifdef PROCESSOR_ARCH_armv7_a
-        /*
-         * Keeps this setting in sync with memory type attributes in:
-         * init_boot_pt (boot/arch/arm32/src/mm.c)
-         * set_pt_level1_flags (kernel/arch/arm32/include/arch/mm/page_armv6.h)
-         * set_ptl0_addr (kernel/arch/arm32/include/arch/mm/page.h)
-         */
-        pte->tex = section_cacheable(frame) ? 5 : 0;
-        pte->cacheable = section_cacheable(frame) ? 0 : 0;
-        pte->bufferable = section_cacheable(frame) ? 1 : 0;
-#else
-        pte->bufferable = 1;
-        pte->cacheable = section_cacheable(frame);
         pte->tex = 0;
-#endif
         pte->access_permission_1 = 0;
         pte->shareable = 0;
@@ -166 +117 @@
 static void init_boot_pt(void)
 {
-        /*
-         * Create 1:1 virtual-physical mapping.
-         * Physical memory on BBxM a BBone starts at 2GB
-         * boundary, icp has a memory mirror at 2GB.
-         * (ARM Integrator Core Module User guide ch. 6.3,  p. 6-7)
-         * gta02 somehow works (probably due to limited address size),
-         * s3c2442b manual ch. 5, p.5-1:
-         * "Address space: 128Mbytes per bank (total 1GB/8 banks)"
-         */
-        for (pfn_t page = 0; page < PTL0_ENTRIES; ++page)
+#if defined MACHINE_raspberrypi
+        const pfn_t split_page = 2048;
+#else
+        const pfn_t split_page = PTL0_ENTRIES;
+#endif
+
+        /* Create 1:1 virtual-physical mapping (in lower 2 GB). */
+        pfn_t page;
+        for (page = 0; page < split_page; page++)
                 init_ptl0_section(&boot_pt[page], page);
 
-        /*
-         * Tell MMU page might be cached. Keeps this setting in sync
-         * with memory type attributes in:
-         * init_ptl0_section (boot/arch/arm32/src/mm.c)
-         * set_pt_level1_flags (kernel/arch/arm32/include/arch/mm/page_armv6.h)
-         * set_ptl0_addr (kernel/arch/arm32/include/arch/mm/page.h)
-         */
-        uint32_t val = (uint32_t)boot_pt & TTBR_ADDR_MASK;
-        val |= TTBR_RGN_WBWA_CACHE | TTBR_C_FLAG;
-        TTBR0_write(val);
+#if defined MACHINE_raspberrypi
+        for (; page < PTL0_ENTRIES; page++)
+                init_ptl0_section(&boot_pt[page], page - split_page);
+#endif  
+        asm volatile (
+                "mcr p15, 0, %[pt], c2, c0, 0\n"
+                :: [pt] "r" (boot_pt)
+        );
 }
 
@@ -206 +154 @@
                  * we disable caches before jumping to kernel
                  * so this is safe for all archs.
-                 * Enable VMSAv6 the bit (23) is only writable on ARMv6.
-                 * (and QEMU)
                  */
-#ifdef PROCESSOR_ARCH_armv6
-                "ldr r1, =0x00801805\n"
-#else
                 "ldr r1, =0x00001805\n"
-#endif
                 
                 "orr r0, r0, r1\n"
@@ -231 +173 @@
 void mmu_start() {
         disable_paging();
-#ifdef PROCESSOR_ARCH_armv7_a
-        /* Make sure we run in memory code when caches are enabled,
-         * make sure we read memory data too. This part is ARMv7 specific as
-         * ARMv7 no longer invalidates caches on restart.
-         * See chapter B2.2.2 of ARM Architecture Reference Manual p. B2-1263*/
-        cache_invalidate();
-#endif
         init_boot_pt();
         enable_paging();