Changeset 00aece0 in mainline for kernel/arch/ppc32/src

Timestamp:

2012-02-18T16:47:38Z (14 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.

Location:

kernel/arch/ppc32/src

Files:

• drivers/pic.c (modified) (2 diffs)
• mm/frame.c (modified) (4 diffs)
• mm/km.c (added)
• mm/page.c (modified) (1 diff)
• ppc32.c (modified) (4 diffs)

kernel/arch/ppc32/src/drivers/pic.c

@@ -34 +34 @@
 
 #include <arch/drivers/pic.h>
-#include <mm/page.h>
+#include <mm/km.h>
 #include <byteorder.h>
 #include <bitops.h>
@@ -42 +42 @@
 void pic_init(uintptr_t base, size_t size, cir_t *cir, void **cir_arg)
 {
-        pic = (uint32_t *) hw_map(base, size);
+        pic = (uint32_t *) km_map(base, size, PAGE_WRITE | PAGE_NOT_CACHEABLE);
         *cir = pic_ack_interrupt;
         *cir_arg = NULL;

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

@@ -40 +40 @@
 #include <print.h>
 
-uintptr_t last_frame = 0;
 memmap_t memmap;
 
@@ -54 +53 @@
 }
 
-void frame_arch_init(void)
+static void frame_common_arch_init(bool low)
 {
         pfn_t minconf = 2;
@@ -61 +60 @@
         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,
+                uintptr_t base = 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);
+                size_t size = ALIGN_DOWN(memmap.zones[i].size -
+                    (base - ((uintptr_t) memmap.zones[i].start)), FRAME_SIZE);
                 
-                pfn_t pfn = ADDR2PFN(new_start);
-                size_t count = SIZE2FRAMES(new_size);
-                
+                if (!frame_adjust_zone_bounds(low, &base, &size))
+                        return;
+
+                pfn_t pfn = ADDR2PFN(base);
+                size_t count = SIZE2FRAMES(size);
                 pfn_t conf;
-                if ((minconf < pfn) || (minconf >= pfn + count))
-                        conf = pfn;
-                else
-                        conf = minconf;
-                
-                zone_create(pfn, count, conf, 0);
-                
-                if (last_frame < ALIGN_UP(new_start + new_size, FRAME_SIZE))
-                        last_frame = ALIGN_UP(new_start + new_size, FRAME_SIZE);
+
+                if (low) {
+                        if ((minconf < pfn) || (minconf >= pfn + count))
+                                conf = pfn;
+                        else
+                                conf = minconf;
+                        zone_create(pfn, count, conf,
+                            ZONE_AVAILABLE | ZONE_LOWMEM);
+                } else {
+                        conf = zone_external_conf_alloc(count);
+                        if (conf != 0)
+                                zone_create(pfn, count, conf,
+                                    ZONE_AVAILABLE | ZONE_HIGHMEM);
+                }
         }
+        
+}
+
+void frame_low_arch_init(void)
+{
+        frame_common_arch_init(true);
         
         /* First is exception vector, second is 'implementation specific',
@@ -92 +104 @@
 }
 
+void frame_high_arch_init(void)
+{
+        frame_common_arch_init(false);
+}
+
 /** @}
  */

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

@@ -46 +46 @@
 }
 
-uintptr_t hw_map(uintptr_t physaddr, size_t size)
-{
-        if (last_frame + ALIGN_UP(size, PAGE_SIZE) >
-            KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
-                panic("Unable to map physical memory %p (%zu bytes).",
-                    (void *) physaddr, size);
-        
-        uintptr_t virtaddr = PA2KA(last_frame);
-        pfn_t i;
-        page_table_lock(AS_KERNEL, true);
-        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_WRITE);
-        page_table_unlock(AS_KERNEL, true);
-        
-        last_frame = ALIGN_UP(last_frame + size, FRAME_SIZE);
-        
-        return virtaddr;
-}
-
 /** @}
  */

kernel/arch/ppc32/src/ppc32.c

@@ -46 +46 @@
 #include <userspace.h>
 #include <mm/page.h>
+#include <mm/km.h>
 #include <abi/proc/uarg.h>
 #include <console/console.h>
@@ -71 +72 @@
         size_t i;
         for (i = 0; i < init.cnt; i++) {
-                init.tasks[i].addr = (uintptr_t) bootinfo->taskmap.tasks[i].addr;
+                init.tasks[i].paddr = KA2PA(bootinfo->taskmap.tasks[i].addr);
                 init.tasks[i].size = bootinfo->taskmap.tasks[i].size;
                 str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN,
@@ -208 +209 @@
                 size_t size = 2 * PAGE_SIZE;
                 
-                cuda_t *cuda = (cuda_t *)
-                    (hw_map(aligned_addr, offset + size) + offset);
+                cuda_t *cuda = (cuda_t *) (km_map(aligned_addr, offset + size,
+                    PAGE_WRITE | PAGE_NOT_CACHEABLE) + offset);
                 
                 /* Initialize I/O controller */
@@ -231 +232 @@
                 sysinfo_set_item_val("cuda.inr", NULL, IRQ_CUDA);
                 sysinfo_set_item_val("cuda.address.physical", NULL, pa);
-                sysinfo_set_item_val("cuda.address.kernel", NULL,
-                    (uintptr_t) cuda);
 #endif
         }