Changeset 00aece0 in mainline for kernel/arch/ppc32/src/ppc32.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/ppc32/src/ppc32.c (modified) (4 diffs)

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
         }