Changeset 50b3d30 in mainline for kernel/arch/ia64/src

Timestamp:

2008-11-30T21:35:13Z (17 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

c716d94

Parents:

1baec4b

Message:

IA64: repair similators support

Location:

kernel/arch/ia64/src

Files:

• ia64.c (modified) (7 diffs)
• interrupt.c (modified) (1 diff)
• ski/ski.c (modified) (1 diff)
• smp/smp.c (modified) (1 diff)

kernel/arch/ia64/src/ia64.c

@@ -120 +120 @@
         int i;
         
-        
+        int myid,myeid;
+        
+        myid=ia64_get_cpu_id();
+        myeid=ia64_get_cpu_eid();
+
         for(i=0;i<16;i++)
         {
@@ -131 +135 @@
                 ((uint32_t*)(IOSAPIC+0x00))[0]=0x10+2*i+1;
                 srlz_d();
-                ((uint32_t*)(IOSAPIC+0x10))[0]=1<<(56-32);
+                ((uint32_t*)(IOSAPIC+0x10))[0]=myid<<(56-32) | myeid<<(48-32);
                 srlz_d();
         }
@@ -170 +174 @@
 {
         while (1) {
-                i8042_poll();
 #ifdef CONFIG_NS16550
         #ifndef CONFIG_NS16550_INTERRUPT_DRIVEN
                 ns16550_poll();
         #endif  
+#else
+        #ifndef CONFIG_I8042_INTERRUPT_DRIVEN
+                i8042_poll();
+        #endif  
 #endif
                 thread_usleep(POLL_INTERVAL);
@@ -182 +189 @@
 
 
-static void end_of_irq_void(void *cir_arg __attribute__((unused)),inr_t inr __attribute__((unused)))
+void end_of_irq_void(void *cir_arg __attribute__((unused)),inr_t inr __attribute__((unused)));
+void end_of_irq_void(void *cir_arg __attribute__((unused)),inr_t inr __attribute__((unused)))
 {
         return;
@@ -205 +213 @@
 #ifdef I460GX
                 devno_t kbd = device_assign_devno();
-                devno_t mouse = device_assign_devno();
                 /* keyboard controller */
-                i8042_init(kbd, IRQ_KBD, mouse, IRQ_MOUSE);
 
 #ifdef CONFIG_NS16550
                 ns16550_init(kbd, NS16550_PORT, NS16550_IRQ,end_of_irq_void,NULL); // as a COM 1
 #else
+                devno_t mouse = device_assign_devno();
+                i8042_init(kbd, IRQ_KBD, mouse, IRQ_MOUSE);
 #endif
                 thread_t *t;
@@ -281 +289 @@
         ski_kbd_grab();
 #else
-        i8042_grab();
         #ifdef CONFIG_NS16550
                 ns16550_grab();
+        #else
+                i8042_grab();
         #endif  
-                
 #endif  
 }
@@ -295 +303 @@
 #ifdef SKI
         ski_kbd_release();
-        i8042_release();
 #else   
         #ifdef CONFIG_NS16550
                 ns16550_release();
+        #else   
+                i8042_release();
         #endif  
 

kernel/arch/ia64/src/interrupt.c

@@ -263 +263 @@
 #endif
 
-
+                case INTERRUPT_TIMER:
+                        {
+
+                                irq_t *irq = irq_dispatch_and_lock(ivr.vector);
+                                if (irq) {
+                                        irq->handler(irq, irq->arg);
+                                        spinlock_unlock(&irq->lock);
+                                } else {
+                                        panic("\nUnhandled Internal Timer Interrupt (%d)\n",ivr.vector);
+                                }
+                        }       
+                        break;
+                                
                 default:
                         {

kernel/arch/ia64/src/ski/ski.c

@@ -45 +45 @@
 #include <synch/spinlock.h>
 #include <arch/asm.h>
-#include <drivers/kbd.h>
+#include <arch/drivers/kbd.h>
 
 #define SKI_KBD_INR     0

kernel/arch/ia64/src/smp/smp.c

@@ -115 +115 @@
 void smp_init(void)
 {
+        if(!bootinfo->hello_configured) return; 
+        //If we have not system prepared by hello, we are not able to start AP's
+        //this means we are running on simulator
+        
         sapic_init();
         ipi_broadcast_arch_all(bootinfo->wakeup_intno);