Changeset c6e314a in mainline for kernel/arch/sparc64/src/mm

Timestamp:

2006-07-14T11:39:02Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

08a7802f

Parents:

10b890b

Message:

Change hw_map() on sparc64 to use virtual addresses that are
beyond the end of physical memory. It is beneficial in two
ways: first, physical memory is no longer being wasted by
otherwise necessary calls to frame_alloc() and, second,
virtual addresses for devices are now correctly allocated
and do not overlap with the 4M TLB-locked mapping for
kernel text and data.

Location:

kernel/arch/sparc64/src/mm

Files:

• frame.c (modified) (3 diffs)
• page.c (modified) (4 diffs)
• tlb.c (modified) (1 diff)

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

@@ -36 +36 @@
 #include <mm/frame.h>
 #include <arch/boot/boot.h>
+#include <arch/types.h>
 #include <config.h>
 #include <align.h>
+#include <macros.h>
+
+uintptr_t last_frame = NULL;
 
 /** Create memory zones according to information stored in bootinfo.
@@ -51 +55 @@
 
         for (i = 0; i < bootinfo.memmap.count; i++) {
+                uintptr_t start = bootinfo.memmap.zones[i].start;
+                size_t size = bootinfo.memmap.zones[i].size;
 
                 /*
@@ -57 +63 @@
                  */
         
-                confdata = ADDR2PFN(bootinfo.memmap.zones[i].start);
+                confdata = ADDR2PFN(start);
                 if (confdata == 0)
                         confdata = 2;
-                zone_create(ADDR2PFN(bootinfo.memmap.zones[i].start),
-                        SIZE2FRAMES(ALIGN_DOWN(bootinfo.memmap.zones[i].size, PAGE_SIZE)),
-                        confdata, 0);
+                zone_create(ADDR2PFN(start), SIZE2FRAMES(ALIGN_DOWN(size, FRAME_SIZE)), confdata, 0);
+                
+                last_frame = max(last_frame, start + ALIGN_UP(size, FRAME_SIZE));
         }
 

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

@@ -27 +27 @@
  */
 
- /** @addtogroup sparc64mm      
+/** @addtogroup sparc64mm       
  * @{
  */
@@ -37 +37 @@
 #include <genarch/mm/page_ht.h>
 #include <mm/frame.h>
+#include <arch/mm/frame.h>
 #include <bitops.h>
 #include <debug.h>
+#include <align.h>
 
 void page_arch_init(void)
@@ -73 +75 @@
         else
                 order = (fnzb32(size - 1) + 1) - FRAME_WIDTH;
+
+        /*
+         * Use virtual addresses that are beyond the limit of physical memory.
+         * Thus, the physical address space will not be wasted by holes created
+         * by frame_alloc().
+         */
+        ASSERT(last_frame);
+        uintptr_t virtaddr = ALIGN_UP(last_frame, 1<<(order + FRAME_WIDTH));
+        last_frame = ALIGN_UP(virtaddr + size, 1<<(order + FRAME_WIDTH));
         
-        uintptr_t virtaddr = (uintptr_t) frame_alloc(order, FRAME_KA);
-
         for (i = 0; i < sizemap[order].count; i++)
                 dtlb_insert_mapping(virtaddr + i*sizemap[order].increment,
@@ -84 +93 @@
 }
 
- /** @}
+/** @}
  */
-

kernel/arch/sparc64/src/mm/tlb.c

@@ -60 +60 @@
 void tlb_arch_init(void)
 {
+        /*
+         * TLBs are actually initialized by
+         * take_over_tlb_and_tt() early
+         * in start.S.
+         */
 }