WebSVN – HelenOS – Diff – /branches/tracing/kernel/arch/ia64/src/smp/smp.c

  */
 /** @file
  */
 #include <arch.h>
-#include <arch/ski/ski.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 <console/console.h>
 #include <proc/uarg.h>
 #include <syscall/syscall.h>
 #include <ddi/irq.h>
 #include <ddi/device.h>
-#include <arch/drivers/ega.h>
 #include <arch/bootinfo.h>
-#include <genarch/kbd/i8042.h>
-#include <genarch/kbd/ns16550.h>
 #include <smp/smp.h>
 #include <smp/ipi.h>
 #include <arch/atomic.h>
 #include <panic.h>
 #include <print.h>
 #ifdef CONFIG_SMP
 extern char cpu_by_id_eid_list[256][256];
 static void sapic_init(void)
+{
-    bootinfo->sapic=(unative_t *)(PA2KA((unative_t)(bootinfo->sapic))|FW_OFFSET);
+    bootinfo->sapic = (unative_t *)(PA2KA((unative_t)(bootinfo->sapic)) |
+        FW_OFFSET);
+}
-static void ipi_broadcast_arch_all(int ipi )
+static void ipi_broadcast_arch_all(int ipi)
+{
-    int id,eid;
+    int id, eid;
-    int myid,myeid;
+    int myid, myeid;
-    myid=ia64_get_cpu_id();
+    myid = ia64_get_cpu_id();
-    myeid=ia64_get_cpu_eid();
+    myeid = ia64_get_cpu_eid();
-    for(id=0;id<256;id++)
+    for (id = 0; id < 256; id++)
-        for(eid=0;eid<256;eid++)
+        for (eid = 0; eid < 256; eid++)
-            if((id!=myid) || (eid!=myeid))
+            if ((id != myid) || (eid != myeid))
-                ipi_send_ipi(id,eid,ipi);
+                ipi_send_ipi(id, eid, ipi);
+}
 void ipi_broadcast_arch(int ipi )
+{
-    int id,eid;
+    int id, eid;
-    int myid,myeid;
+    int myid, myeid;
-    myid=ia64_get_cpu_id();
+    myid = ia64_get_cpu_id();
-    myeid=ia64_get_cpu_eid();
+    myeid = ia64_get_cpu_eid();
-    //printf("Sending ipi %d on %d\n",ipi,CPU->id);
-    for(id=0;id<256;id++)
-        for(eid=0;eid<256;eid++)
-            if((id!=myid) || (eid!=myeid))
-                if(cpu_by_id_eid_list[id][eid])
-                    ipi_send_ipi(id,eid,ipi);
+    for (id = 0; id < 256; id++)
+        for (eid = 0; eid < 256; eid++)
+            if ((id != myid) || (eid != myeid))
+                if (cpu_by_id_eid_list[id][eid])
+                    ipi_send_ipi(id, eid, ipi);
+}
 void smp_init(void)
+{
-    if(!bootinfo->hello_configured) return;
+    if (!bootinfo->hello_configured)
+        return;
+    /*
-    //If we have not system prepared by hello, we are not able to start AP's
+     * If we have not got system prepared by hello, we are not able to start
-    //this means we are running on simulator
+     * AP's. This means we are running on a simulator.
+     */
     sapic_init();
     ipi_broadcast_arch_all(bootinfo->wakeup_intno);
     volatile long long brk;
-        for(brk=0;brk<100LL*1024LL*1024LL;brk++); //wait a while before CPUs starts
+        for (brk = 0; brk < 100LL * 1024LL * 1024LL; brk++)
+        ;   /* wait a while before CPUs starts */
-    config.cpu_count=0;
+    config.cpu_count = 0;
-    int id,eid;
+    int id, eid;
-    for(id=0;id<256;id++)
+    for (id = 0; id < 256; id++)
-        for(eid=0;eid<256;eid++)
+        for (eid = 0; eid < 256; eid++)
-                if(cpu_by_id_eid_list[id][eid]==1){
+                if (cpu_by_id_eid_list[id][eid] == 1) {
                     config.cpu_count++;
-                    cpu_by_id_eid_list[id][eid]=2;
+                    cpu_by_id_eid_list[id][eid] = 2;
+            }
+}
 void kmp(void *arg __attribute__((unused)))
+{
-    int id,eid;
+    int id, eid;
-    int myid,myeid;
+    int myid, myeid;
-    myid=ia64_get_cpu_id();
+    myid = ia64_get_cpu_id();
-    myeid=ia64_get_cpu_eid();
+    myeid = ia64_get_cpu_eid();
-    for(id=0;id<256;id++)
+    for (id = 0; id < 256; id++)
-        for(eid=0;eid<256;eid++)
+        for (eid = 0; eid < 256; eid++)
-                if((id!=myid) || (eid!=myeid))
+                if ((id != myid) || (eid != myeid))
-                    if(cpu_by_id_eid_list[id][eid]!=0){
+                    if (cpu_by_id_eid_list[id][eid] != 0) {
-                        if(cpu_by_id_eid_list[id][eid]==1){
+                        if (cpu_by_id_eid_list[id][eid] == 1) {
-                            //config.cpu_count++;
+                            printf("Found Late CPU ID:%d "
-                            //cpu_by_id_eid_list[id][eid]=2;
+                            "EDI:%d Not added to "
-                            printf("Found Late CPU ID:%d EDI:%d Not added to system!!!\n",id,eid);
+                            "system!!!\n", id, eid);
                             continue;
-                            }
+                    }
-                    cpu_by_id_eid_list[id][eid]=3;
+                    cpu_by_id_eid_list[id][eid] = 3;
                     /*
-                     * There may be just one AP being initialized at
+                     * There may be just one AP being
+                     * initialized at the time. After
-                     * the time. After it comes completely up, it is
+                     * it comes completely up, it is
                      * supposed to wake us up.
                      */
+                    if (waitq_sleep_timeout(
-                    if (waitq_sleep_timeout(&ap_completion_wq, 1000000,
+                        &ap_completion_wq, 1000000,
-                        SYNCH_FLAGS_NONE) == ESYNCH_TIMEOUT) {
+                        SYNCH_FLAGS_NONE) ==
+                        ESYNCH_TIMEOUT) {
-                        printf("%s: waiting for cpu ID:%d EID:%d"
+                        printf("%s: waiting for cpu "
-                            "timed out\n", __FUNCTION__,
+                            "ID:%d EID:%d timed out\n",
-                            id, eid);
+                            __FUNCTION__, id, eid);
                         }
+                }
+}
-#endif
-/*This is just a hack for linking with assembler - may be removed in future*/
-#ifndef CONFIG_SMP
-void main_ap(void);
-void main_ap(void)
-{
-    while(1);
-}
 #endif
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/tracing/kernel/arch/ia64/src/smp/smp.c – Rev 3675 → 4377