Changeset ef9a2a8 in mainline for kernel/arch/sparc32/src

Timestamp:

2013-09-15T19:23:19Z (12 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

3efc35a

Parents:

b6b02c0

Message:

Introduce early MMU support in kernel. At current state, it
is possible to create initial kernel address space, map kernel
identity into it and take over MMU control. ASID FIFO support
should also work.

Location:

kernel/arch/sparc32/src

Files:

• mm/as.c (modified) (2 diffs)
• mm/frame.c (modified) (1 diff)
• mm/page.c (modified) (1 diff)
• sparc32.c (modified) (1 diff)
• start.S (modified) (1 diff)

kernel/arch/sparc32/src/mm/as.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Martin Decky
+ * Copyright (c) 2013 Jakub Klama
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup abs32lemm
+/** @addtogroup sparc32mm
  * @{
  */
 
 #include <mm/as.h>
+#include <arch/arch.h>
+#include <arch/asm.h>
 #include <arch/mm/as.h>
+#include <arch/mm/page.h>
 #include <genarch/mm/page_pt.h>
+
+static ptd_t context_table[ASID_MAX_ARCH] __attribute__((aligned (1024)));
 
 void as_arch_init(void)
 {
         as_operations = &as_pt_operations;
+        as_context_table = (uintptr_t)&context_table;
+}
+
+void as_install_arch(as_t *as)
+{
+        printf("as_install_arch(asid=%d)\n", as->asid);
+        printf("genarch.page_table=%p\n", as->genarch.page_table);
+
+        context_table[as->asid].table_pointer = (uintptr_t)as->genarch.page_table >> 6;
+        context_table[as->asid].et = PTE_ET_DESCRIPTOR;
+        asi_u32_write(ASI_MMUREGS, 0x200, as->asid);
 }
 

kernel/arch/sparc32/src/mm/frame.c

@@ -48 +48 @@
         //machine_get_memory_extents(&base, &size);
         base = 0x40000000;
-        size = 0x2000000;
+        size = 0x4000000;
 
         base = ALIGN_UP(base, FRAME_SIZE);

kernel/arch/sparc32/src/mm/page.c

@@ -49 +49 @@
 #include <print.h>
 #include <interrupt.h>
+#include <macros.h>
 
 void page_arch_init(void)
 {
-        if (config.cpu_active == 1)
-                page_mapping_operations = &pt_mapping_operations;
+        int flags = PAGE_CACHEABLE | PAGE_EXEC;
+        page_mapping_operations = &pt_mapping_operations;
+
+        page_table_lock(AS_KERNEL, true);
+        
+        /* Kernel identity mapping */
+        //FIXME: We need to consider the possibility that
+        //identity_base > identity_size and physmem_end.
+        //This might lead to overflow if identity_size is too big.
+        for (uintptr_t cur = PHYSMEM_START_ADDR;
+            cur < min(KA2PA(config.identity_base) +
+                config.identity_size, config.physmem_end);
+            cur += FRAME_SIZE)
+                page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
+        
+
+        page_table_unlock(AS_KERNEL, true);
+        as_switch(NULL, AS_KERNEL);
+
+        printf("as_context_table=0x%08x\n", as_context_table);
+
+        /* Switch MMU to new context table */
+        asi_u32_write(ASI_MMUREGS, 0x100, KA2PA(as_context_table) >> 4);
+
+        //boot_page_table_free();
 }
 

kernel/arch/sparc32/src/sparc32.c

@@ -49 +49 @@
 #include <syscall/syscall.h>
 #include <console/console.h>
+#include <macros.h>
 #include <memstr.h>
+#include <str.h>
 
 char memcpy_from_uspace_failover_address;
 char memcpy_to_uspace_failover_address;
 
-void arch_pre_main(void)
+void arch_pre_main(bootinfo_t *bootinfo)
 {
+        init.cnt = min3(bootinfo->cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS);
+        
+        size_t i;
+        for (i = 0; i < init.cnt; i++) {
+                init.tasks[i].paddr = KA2PA(bootinfo->tasks[i].addr);
+                init.tasks[i].size = bootinfo->tasks[i].size;
+                str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN,
+                    bootinfo->tasks[i].name);
+        }
 }
 

kernel/arch/sparc32/src/start.S

@@ -51 +51 @@
         sub     %sp, 96, %sp
 
+        mov     %o1, %i0
         call arch_pre_main
         nop