Changeset 00aece0 in mainline for kernel/arch/sparc64/src/mm/sun4u/frame.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/sparc64/src/mm/sun4u/frame.c (modified) (1 diff)

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

@@ -41 +41 @@
 #include <macros.h>
 
-uintptr_t last_frame = (uintptr_t) NULL;
-
 /** Create memory zones according to information stored in memmap.
  *
  * Walk the memory map and create frame zones according to it.
  */
-void frame_arch_init(void)
+static void frame_common_arch_init(bool low)
 {
-        if (config.cpu_active == 1) {
-                unsigned int i;
+        unsigned int i;
+        
+        for (i = 0; i < memmap.cnt; i++) {
+                uintptr_t base;
+                size_t size;
+
+                /*
+                 * The memmap is created by HelenOS boot loader.
+                 * It already contains no holes.
+                 */
+
+                /* To be safe, make the available zone possibly smaller */
+                base = ALIGN_UP((uintptr_t) memmap.zones[i].start, FRAME_SIZE);
+                size = ALIGN_DOWN(memmap.zones[i].size -
+                    (base - ((uintptr_t) memmap.zones[i].start)), FRAME_SIZE);
                 
-                for (i = 0; i < memmap.cnt; i++) {
-                        /* To be safe, make the available zone possibly smaller */
-                        uintptr_t new_start = ALIGN_UP((uintptr_t) memmap.zones[i].start,
-                            FRAME_SIZE);
-                        size_t new_size = ALIGN_DOWN(memmap.zones[i].size -
-                            (new_start - ((uintptr_t) memmap.zones[i].start)), FRAME_SIZE);
-                        
-                        /*
-                         * The memmap is created by HelenOS boot loader.
-                         * It already contains no holes.
-                         */
-                        
-                        pfn_t confdata = ADDR2PFN(new_start);
-                        
+                if (!frame_adjust_zone_bounds(low, &base, &size))
+                        continue;
+ 
+                pfn_t confdata;
+                pfn_t pfn = ADDR2PFN(base);
+                size_t count = SIZE2FRAMES(size);
+
+                if (low) {
+                        confdata = pfn;
                         if (confdata == ADDR2PFN(KA2PA(PFN2ADDR(0))))
                                 confdata = ADDR2PFN(KA2PA(PFN2ADDR(2)));
                         
-                        zone_create(ADDR2PFN(new_start), SIZE2FRAMES(new_size),
-                            confdata, 0);
-                        
-                        last_frame = max(last_frame, new_start + new_size);
+                        zone_create(pfn, count, confdata,
+                            ZONE_AVAILABLE | ZONE_LOWMEM);
+                } else {
+                        confdata = zone_external_conf_alloc(count);
+                        if (confdata != 0)
+                                zone_create(pfn, count, confdata,
+                                    ZONE_AVAILABLE | ZONE_HIGHMEM);
                 }
-                
-                /*
-                 * On sparc64, physical memory can start on a non-zero address.
-                 * The generic frame_init() only marks PFN 0 as not free, so we
-                 * must mark the physically first frame not free explicitly
-                 * here, no matter what is its address.
-                 */
-                frame_mark_unavailable(ADDR2PFN(KA2PA(PFN2ADDR(0))), 1);
         }
+}
+
+void frame_low_arch_init(void)
+{
+        if (config.cpu_active > 1)
+                return;
         
-        end_of_identity = PA2KA(last_frame);
+        frame_common_arch_init(true);
+        
+        /*
+         * On sparc64, physical memory can start on a non-zero address.
+         * The generic frame_init() only marks PFN 0 as not free, so we
+         * must mark the physically first frame not free explicitly
+         * here, no matter what is its address.
+         */
+        frame_mark_unavailable(ADDR2PFN(KA2PA(PFN2ADDR(0))), 1);
+
+        /* PA2KA will work only on low-memory. */
+        end_of_identity = PA2KA(config.physmem_end - FRAME_SIZE) + PAGE_SIZE;
+}
+
+void frame_high_arch_init(void)
+{
+        if (config.cpu_active > 1)
+                return;
+
+        frame_common_arch_init(false);
 }