Changeset 96cd5b4 in mainline for kernel/arch/mips64/src/mm/frame.c

Timestamp:

2012-01-04T13:37:10Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

9957a97

Parents:

ecf823a (diff), c520034 (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 with mainline

File:

• kernel/arch/mips64/src/mm/frame.c (modified) (5 diffs)

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

@@ -123 +123 @@
 }
 
-static void frame_add_region(pfn_t start_frame, pfn_t end_frame)
-{
-        if (end_frame > start_frame) {
-                /* Convert 1M frames to 16K frames */
-                pfn_t first = ADDR2PFN(start_frame << ZERO_PAGE_WIDTH);
-                pfn_t count = ADDR2PFN((end_frame - start_frame) << ZERO_PAGE_WIDTH);
-                
+static void frame_add_region(pfn_t start_frame, pfn_t end_frame, bool low)
+{
+        if (end_frame <= start_frame)
+                return;
+
+        uintptr_t base = start_frame << ZERO_PAGE_WIDTH;
+        size_t size = (end_frame - start_frame) << ZERO_PAGE_WIDTH;
+
+        if (!frame_adjust_zone_bounds(low, &base, &size))
+                return; 
+
+        pfn_t first = ADDR2PFN(base);
+        size_t count = SIZE2FRAMES(size);
+        pfn_t conf_frame;
+
+        if (low) {
                 /* Interrupt vector frame is blacklisted */
-                pfn_t conf_frame;
                 if (first == 0)
                         conf_frame = 1;
                 else
                         conf_frame = first;
+                zone_create(first, count, conf_frame,
+                    ZONE_AVAILABLE | ZONE_LOWMEM);
+        } else {
+                conf_frame = zone_external_conf_alloc(count);
+                zone_create(first, count, conf_frame,
+                    ZONE_AVAILABLE | ZONE_HIGHMEM);
+        }
                 
-                zone_create(first, count, conf_frame, 0);
                 
-                if (phys_regions_count < MAX_REGIONS) {
-                        phys_regions[phys_regions_count].start = first;
-                        phys_regions[phys_regions_count].count = count;
-                        phys_regions_count++;
-                }
+        if (phys_regions_count < MAX_REGIONS) {
+                phys_regions[phys_regions_count].start = first;
+                phys_regions[phys_regions_count].count = count;
+                phys_regions_count++;
         }
 }
@@ -156 +169 @@
  *
  */
-void frame_arch_init(void)
+void frame_low_arch_init(void)
 {
         ipl_t ipl = interrupts_disable();
@@ -207 +220 @@
                 
                 if (!avail) {
-                        frame_add_region(start_frame, frame);
+                        frame_add_region(start_frame, frame, true);
                         start_frame = frame + 1;
                         avail = true;
@@ -213 +226 @@
         }
         
-        frame_add_region(start_frame, frame);
+        frame_add_region(start_frame, frame, true);
         
         /* Blacklist interrupt vector frame */
@@ -229 +242 @@
 }
 
+void frame_high_arch_init(void)
+{
+}
+
 void physmem_print(void)
 {