Changeset 6b781c0 in mainline for kernel/arch/arm32/src/mm

Timestamp:

2007-06-08T15:02:49Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c03ee1c

Parents:

3ee8a075

Message:

Merge arm32 into trunk.

Location:

kernel/arch/arm32/src/mm

Files:

• as.c (modified) (3 diffs)
• frame.c (modified) (2 diffs)
• memory_init.c (added)
• page.c (modified) (3 diffs)
• page_fault.c (added)
• tlb.c (added)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Jakub Jermar
+ * Copyright (c) 2007 Pavel Jancik, Michal Kebrt
  * All rights reserved.
  *
@@ -31 +31 @@
  */
 /** @file
+ *  @brief Address space functions.
  */
 
@@ -39 +40 @@
 #include <arch.h>
 
-/** Architecture dependent address space init. */
+/** Architecture dependent address space init.
+ *  
+ *  Since ARM supports page tables, #as_pt_operations are used.
+ */
 void as_arch_init(void)
 {
-        as_operations = &as_pt_operations;
-        asid_fifo_init();
-}
-
-/** Install address space.
- *
- * Install ASID.
- *
- * @param as Address space structure.
- */
-void as_install_arch(as_t *as)
-{
-        /* TODO */
+        as_operations = &as_pt_operations;
 }
 

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Jakub Jermar
+ * Copyright (c) 2007 Pavel Jancik, Michal Kebrt
  * All rights reserved.
  *
@@ -31 +31 @@
  */
 /** @file
+ *  @brief Frame related functions.
  */
 
 #include <mm/frame.h>
+#include <arch/mm/frame.h>
+#include <config.h>
+#include <arch/debug/print.h>
 
-/** Create memory zones. */
+/** Address of the last frame in the memory. */
+uintptr_t last_frame = 0;
+
+/** Creates memory zones. */
 void frame_arch_init(void)
 {
-        /* TODO */
+        /* all memory as one zone */
+        zone_create(0, ADDR2PFN(config.memory_size),
+            BOOT_PAGE_TABLE_START_FRAME + BOOT_PAGE_TABLE_SIZE_IN_FRAMES, 0);
+        last_frame = config.memory_size;
+
+        /* blacklist boot page table */
+        frame_mark_unavailable(BOOT_PAGE_TABLE_START_FRAME,
+            BOOT_PAGE_TABLE_SIZE_IN_FRAMES);
+}
+
+/** Frees the boot page table. */
+void boot_page_table_free(void)
+{
+        int i;
+        for (i = 0; i < BOOT_PAGE_TABLE_SIZE_IN_FRAMES; i++) {
+                frame_free(i * FRAME_SIZE + BOOT_PAGE_TABLE_ADDRESS);
+        }
 }
 

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2003-2004 Jakub Jermar
+ * Copyright (c) 2007 Pavel Jancik, Michal Kebrt
  * All rights reserved.
  *
@@ -31 +31 @@
  */
 /** @file
+ *  @brief Paging related functions.
  */
 
@@ -36 +37 @@
 #include <genarch/mm/page_pt.h>
 #include <mm/page.h>
+#include <align.h>
+#include <config.h>
+#include <arch/exception.h>
+#include <typedefs.h>
+#include <arch/types.h>
+#include <interrupt.h>
+#include <arch/mm/frame.h>
 
+/** Initializes page tables.
+ *
+ * 1:1 virtual-physical mapping is created in kernel address space. Mapping
+ * for table with exception vectors is also created.
+ */
 void page_arch_init(void)
 {
+        uintptr_t cur;
+        int flags;
+
         page_mapping_operations = &pt_mapping_operations;
+
+        flags = PAGE_CACHEABLE;
+
+        /* PA2KA(identity) mapping for all frames until last_frame */
+        for (cur = 0; cur < last_frame; cur += FRAME_SIZE) {
+                page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
+        }
+        
+        /* create mapping for exception table at high offset */
+#ifdef HIGH_EXCEPTION_VECTORS
+        void *virtaddr = frame_alloc(ONE_FRAME, FRAME_KA);
+        page_mapping_insert(AS_KERNEL, EXC_BASE_ADDRESS, KA2PA(virtaddr), flags);
+#else
+#error "Only high exception vector supported now"
+#endif
+
+        as_switch(NULL, AS_KERNEL);
+
+        boot_page_table_free();
 }
 
-/** Map device into kernel space. */
+/** Maps device into the kernel space.
+ *
+ * Maps physical address of device into kernel virtual address space (so it can
+ * be accessed only by kernel through virtual address).
+ *
+ * @param physaddr Physical address where device is connected.
+ * @param size Length of area where device is present.
+ *
+ * @return Virtual address where device will be accessible.
+ */
 uintptr_t hw_map(uintptr_t physaddr, size_t size)
 {
-        /* TODO */
-        return NULL;
+        if (last_frame + ALIGN_UP(size, PAGE_SIZE) >
+            KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH)) {
+                panic("Unable to map physical memory %p (%d bytes)",
+                    physaddr, size)
+        }
+
+        uintptr_t virtaddr = PA2KA(last_frame);
+        pfn_t i;
+        for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++) {
+                page_mapping_insert(AS_KERNEL, virtaddr + PFN2ADDR(i),
+                    physaddr + PFN2ADDR(i),
+                    PAGE_NOT_CACHEABLE | PAGE_READ | PAGE_WRITE | PAGE_KERNEL);
+        }
+
+        last_frame = ALIGN_UP(last_frame + size, FRAME_SIZE);
+        return virtaddr;
 }