Changeset 96cd5b4 in mainline for kernel/arch/ia64/src/ia64.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/ia64/src/ia64.c (modified) (7 diffs)

kernel/arch/ia64/src/ia64.c

@@ -45 +45 @@
 #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>
@@ -51 +52 @@
 #include <genarch/kbrd/kbrd.h>
 #include <genarch/srln/srln.h>
+#include <mm/page.h>
+
+#ifdef MACHINE_ski
+#include <arch/drivers/ski.h>
+#endif
 
 /* NS16550 as a COM 1 */
@@ -58 +64 @@
 
 static uint64_t iosapic_base = 0xfec00000;
+uintptr_t legacyio_virt_base = 0;
 
 /** Performs ia64-specific initialization before main_bsp() is called. */
@@ -80 +87 @@
 static void iosapic_init(void)
 {
-        uint64_t IOSAPIC = PA2KA((sysarg_t)(iosapic_base)) | FW_OFFSET;
+        uintptr_t IOSAPIC = hw_map(iosapic_base, PAGE_SIZE);
         int i;
         
@@ -107 +114 @@
 {
         if (config.cpu_active == 1) {
+                /* Map the page with legacy I/O. */
+                legacyio_virt_base = hw_map(LEGACYIO_PHYS_BASE, LEGACYIO_SIZE);
+
                 iosapic_init();
                 irq_init(INR_COUNT, INR_COUNT);
@@ -113 +123 @@
 }
 
-void arch_post_cpu_init(void)
-{
+void arch_post_cpu_init(void){
 }
 
@@ -202 +211 @@
         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);
 }