Merge pull request #3392 from bigmagic123/fix_mmu

[bsp/raspi3] raspi3 mmu

Author: BernardXiong

bsp/raspberry-pi/raspi3-64/driver/SConscript

@@ -7,7 +7,6 @@ src     = Split('''
 board.c
 bcm283x.c
 drv_uart.c
-mbox.c
 ''')
 CPPPATH = [cwd]
 

bsp/raspberry-pi/raspi3-64/driver/board.c

@@ -16,6 +16,7 @@
 #include "drv_timer.h"
 
 #include "cp15.h"
+#include "mmu.h"
 
 #ifdef RT_USING_SMP
 extern void rt_hw_ipi_handler_install(int ipi_vector, rt_isr_handler_t ipi_isr_handler);
@@ -57,156 +58,17 @@ void idle_wfi(void)
     asm volatile ("wfi");
 }
 
-#define MMU_LEVEL_MASK 0x1ffUL
-#define MMU_MAP_ERROR_VANOTALIGN  -1
-#define MMU_MAP_ERROR_PANOTALIGN  -2
-#define MMU_MAP_ERROR_NOPAGE      -3
-#define MMU_MAP_ERROR_CONFLICT    -4
-
-unsigned char main_tbl[4096] __attribute__((aligned (4096)));
-unsigned char __page_start[4096*100] __attribute__((aligned (4096)));
-unsigned long __page_off = 0;
-unsigned long get_free_page(void) {
-    __page_off += 4096;
-    return (unsigned long)(__page_start + __page_off - 4096);
-}
-
-#define MEM_ATTR_MEM ((0x1UL << 10) | (0x2UL << 8) | (0x0UL << 6) | (0x1UL << 2))
-#define MEM_ATTR_IO ((0x1UL << 10) | (0x2UL << 8) | (0x0UL << 6) | (0x2UL << 2))
-
-static int map_single_page_2M(unsigned long* lv0_tbl, unsigned long va, unsigned long pa, unsigned long attr) {
-    int level;
-    unsigned long* cur_lv_tbl = lv0_tbl;
-    unsigned long page;
-    unsigned long off;
-    int level_shift = 39;
-
-    if (va & (0x200000UL - 1)) {
-        return MMU_MAP_ERROR_VANOTALIGN;
-    }
-    if (pa & (0x200000UL - 1)) {
-        return MMU_MAP_ERROR_PANOTALIGN;
-    }
-    for (level = 0; level < 2; level++) {
-        off = (va >> level_shift);
-        off &= MMU_LEVEL_MASK;
-        if ((cur_lv_tbl[off] & 1) == 0) {
-            page = get_free_page();
-            if (!page) {
-                return MMU_MAP_ERROR_NOPAGE;
-            }
-            rt_memset((void *)page, 0, 4096);
-            cur_lv_tbl[off] = page | 0x3UL;
-        }
-        page = cur_lv_tbl[off];
-        if (!(page & 0x2)) {
-            //is block! error!
-            return MMU_MAP_ERROR_CONFLICT;
-        }
-        cur_lv_tbl = (unsigned long*)(page & 0x0000fffffffff000UL);
-        level_shift -= 9;
-    }
-    attr &= 0xfff0000000000ffcUL;
-    pa |= (attr | 0x1UL); //block
-    off = (va >> 21);
-    off &= MMU_LEVEL_MASK;
-    cur_lv_tbl[off] = pa;
-    return 0;
-}
-
-int armv8_map_2M(unsigned long* lv0_tbl, unsigned long va, unsigned long pa, int count, unsigned long attr)
-{
-	int i;
-    int ret;
-
-	if (va & (0x200000 - 1))
-	{
-		return -1;
-	}
-	if (pa & (0x200000 - 1))
-	{
-		return -1;
-	}
-	for (i = 0; i < count; i++)
-	{
-		ret = map_single_page_2M(lv0_tbl, va, pa, attr);
-		va += 0x200000;
-		pa += 0x200000;
-        if (ret != 0)
-        {
-            return ret;
-        }
-	}
-    return 0;
-}
-
 /**
  *  Initialize the Hardware related stuffs. Called from rtthread_startup() 
  *  after interrupt disabled.
  */
 void rt_hw_board_init(void)
 {
-    /* mmu set */
-    unsigned long val64;
-    unsigned long val32; //val32不是uint32_t,val32只是表示相关的那个寄存器是32位的
-    int ret;
-
-    val64 = 0x007f6eUL;
-    asm volatile("msr MAIR_EL1, %0\n dsb sy\n"::"r"(val64));
-    asm volatile("mrs %0, MAIR_EL1\n dsb sy\n":"=r"(val64));
-
-    //TCR_EL1
-    val32 = (16UL << 0)
-        | (0x0UL << 6)
-        | (0x0UL << 7)
-        | (0x3UL << 8)
-        | (0x3UL << 10)
-        | (0x2UL << 12)
-        | (0x0UL << 14)
-        | (0x0UL << 16)
-        | (0x0UL << 22)
-        | (0x1UL << 23)
-        | (0x2UL << 30)
-        | (0x1UL << 32)
-        | (0x0UL << 35)
-        | (0x0UL << 36)
-        | (0x0UL << 37)
-        | (0x0UL << 38);
-    asm volatile("msr TCR_EL1, %0\n"::"r"(val32));
-    asm volatile("mrs %0, TCR_EL1\n":"=r"(val32));
-
-    asm volatile("msr TTBR0_EL1, %0\n dsb sy\n"::"r"(main_tbl));
-    asm volatile("mrs %0, TTBR0_EL1\n dsb sy\n":"=r"(val64));
-
-    rt_memset(main_tbl, 0, 4096);
-
-	ret = armv8_map_2M((unsigned long *)main_tbl, 0x0, 0x0, 32, MEM_ATTR_MEM); //32*2M = 64M
-    if (ret)
-    {
-        goto skip_mmu;
-    }
-	ret = armv8_map_2M((unsigned long *)main_tbl, 0x3f000000, 0x3f000000, 8, MEM_ATTR_IO); //8*2M = 16M
-    if (ret)
-    {
-        goto skip_mmu;
-    }
-
-	//关闭指令cache
-	__asm__ volatile("mrs %0, SCTLR_EL1\n":"=r"(val64));
-	val64 &= ~0x1000; //disable I
-	__asm__ volatile("dmb sy\n msr SCTLR_EL1, %0\n isb sy\n"::"r"(val64));
-
-	//清除指令cache
-	__asm__ volatile("IC IALLUIS\n dsb sy\n isb sy\n");
-	//清除tlb
-	__asm__ volatile("tlbi vmalle1\n dsb sy\n isb sy\n");
-
-	//SCTLR_EL1, turn on mmu
-	asm volatile("mrs %0, SCTLR_EL1\n":"=r"(val32));
-	val32 |= 0x1005; //enable mmu, I C M
-	asm volatile("dmb sy\n msr SCTLR_EL1, %0\nisb sy\n"::"r"(val32));
-
-skip_mmu:
+    mmu_init();
+    armv8_map(0, 0, 0x800000, MEM_ATTR_MEMORY);
+    armv8_map(0x3f00B000, 0x3f00B000, 0x1000, MEM_ATTR_IO);//timer
+    armv8_map(0x3f200000, 0x3f200000, 0x16000, MEM_ATTR_IO);//uart
+    mmu_enable();
 
     /* initialize hardware interrupt */
     rt_hw_interrupt_init(); // in libcpu/interrupt.c. Set some data structures, no operation on device
@@ -232,7 +94,7 @@ void rt_hw_board_init(void)
 #ifdef RT_USING_COMPONENTS_INIT
     rt_components_board_init();
 #endif
-	rt_kprintf("__page_off = %x\n", __page_off);
+
 }
 
 #ifdef RT_USING_SMP