Changeset b7068da in mainline for kernel/arch/ia64/src/ia64.c

Timestamp:

2012-02-09T20:35:12Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (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/ia64/src/ia64.c (modified) (8 diffs)

kernel/arch/ia64/src/ia64.c

@@ -34 +34 @@
 
 #include <arch.h>
-#include <arch/drivers/ski.h>
-#include <arch/drivers/it.h>
-#include <arch/interrupt.h>
-#include <arch/barrier.h>
-#include <arch/asm.h>
-#include <arch/register.h>
 #include <typedefs.h>
-#include <arch/context.h>
-#include <arch/stack.h>
-#include <arch/mm/page.h>
+#include <errno.h>
 #include <interrupt.h>
-#include <mm/as.h>
-#include <config.h>
 #include <macros.h>
+#include <str.h>
 #include <userspace.h>
 #include <console/console.h>
-#include <abi/proc/uarg.h>
 #include <syscall/syscall.h>
-#include <ddi/irq.h>
-#include <arch/bootinfo.h>
+#include <sysinfo/sysinfo.h>
+#include <arch/drivers/it.h>
+#include <arch/drivers/kbd.h>
+#include <arch/legacyio.h>
+#include <genarch/drivers/ega/ega.h>
+#include <genarch/drivers/i8042/i8042.h>
+#include <genarch/drivers/ns16550/ns16550.h>
 #include <genarch/drivers/legacy/ia32/io.h>
-#include <genarch/drivers/ega/ega.h>
 #include <genarch/kbrd/kbrd.h>
 #include <genarch/srln/srln.h>
-#include <genarch/drivers/i8042/i8042.h>
-#include <genarch/drivers/ns16550/ns16550.h>
-#include <arch/drivers/kbd.h>
-#include <smp/smp.h>
-#include <smp/ipi.h>
-#include <arch/atomic.h>
-#include <panic.h>
-#include <print.h>
-#include <sysinfo/sysinfo.h>
-#include <str.h>
+#include <mm/page.h>
+#include <mm/km.h>
+
+#ifdef MACHINE_ski
+#include <arch/drivers/ski.h>
+#endif
 
 /* NS16550 as a COM 1 */
@@ -75 +65 @@
 
 static uint64_t iosapic_base = 0xfec00000;
+uintptr_t legacyio_virt_base = 0;
 
 /** Performs ia64-specific initialization before main_bsp() is called. */
 void arch_pre_main(void)
 {
-        init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS);
+        init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS,
+            CONFIG_INIT_TASKS);
         size_t i;
+
         for (i = 0; i < init.cnt; i++) {
-                init.tasks[i].addr =
-                    ((unsigned long) bootinfo->taskmap.tasks[i].addr) |
-                    VRN_MASK;
+                init.tasks[i].paddr =
+                    (uintptr_t) bootinfo->taskmap.tasks[i].addr;
                 init.tasks[i].size = bootinfo->taskmap.tasks[i].size;
                 str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN,
@@ -97 +89 @@
 static void iosapic_init(void)
 {
-        uint64_t IOSAPIC = PA2KA((sysarg_t)(iosapic_base)) | FW_OFFSET;
+        uintptr_t IOSAPIC = km_map(iosapic_base, PAGE_SIZE,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
         int i;
         
@@ -124 +117 @@
 {
         if (config.cpu_active == 1) {
+                /* Map the page with legacy I/O. */
+                legacyio_virt_base = km_map(LEGACYIO_PHYS_BASE, LEGACYIO_SIZE,
+                    PAGE_WRITE | PAGE_NOT_CACHEABLE);
+
                 iosapic_init();
                 irq_init(INR_COUNT, INR_COUNT);
@@ -196 +193 @@
         
 #ifdef CONFIG_I8042
-        i8042_instance_t *i8042_instance = i8042_init((i8042_t *) I8042_BASE, IRQ_KBD);
+        i8042_instance_t *i8042_instance = i8042_init((i8042_t *) I8042_BASE,
+            IRQ_KBD);
         if (i8042_instance) {
                 kbrd_instance_t *kbrd_instance = kbrd_init();
@@ -205 +203 @@
                 }
         }
-        
-        sysinfo_set_item_val("i8042", NULL, true);
-        sysinfo_set_item_val("i8042.inr_a", NULL, IRQ_KBD);
-        sysinfo_set_item_val("i8042.inr_b", NULL, IRQ_MOUSE);
-        sysinfo_set_item_val("i8042.address.physical", NULL,
-            (uintptr_t) I8042_BASE);
-        sysinfo_set_item_val("i8042.address.kernel", NULL,
-            (uintptr_t) I8042_BASE);
-#endif
-
-        sysinfo_set_item_val("netif.ne2000.inr", NULL, IRQ_NE2000);
-
+#endif
+        
         sysinfo_set_item_val("ia64_iospace", NULL, true);
         sysinfo_set_item_val("ia64_iospace.address", NULL, true);
-        sysinfo_set_item_val("ia64_iospace.address.virtual", NULL, IO_OFFSET);
+        sysinfo_set_item_val("ia64_iospace.address.virtual", NULL, LEGACYIO_USER_BASE);
 }
 
@@ -262 +250 @@
  * We use r13 (a.k.a. tp) for this purpose.
  */
-sysarg_t sys_tls_set(sysarg_t addr)
-{
-        return 0;
+sysarg_t sys_tls_set(uintptr_t addr)
+{
+        return EOK;
 }
 
@@ -270 +258 @@
 {
         pio_write_8((ioport8_t *)0x64, 0xfe);
-        while (1)
-                ;
+        while (1);
 }