Changeset 6153749 in mainline

Timestamp:

2005-09-05T09:35:56Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8fe379b5

Parents:

ae9624e

Message:

Add timeout to kmp() so that we don't deadlock while waiting for AP's to come up.

Improve comment in byteorder.h.

Location:

arch

Files:

• ia32/src/smp/smp.c (modified) (4 diffs)
• ppc/include/byteorder.h (modified) (1 diff)

arch/ia32/src/smp/smp.c

@@ -35 +35 @@
 #include <config.h>
 #include <synch/waitq.h>
+#include <synch/synch.h>
 #include <arch/pm.h>
 #include <func.h>
@@ -112 +113 @@
         outb(0x71,0xa);
 
-        cpu_priority_high();
-
         pic_disable_irqs(0xffff);
         apic_init();
@@ -133 +132 @@
 
                 if (ops->cpu_apic_id(i) == l_apic_id()) {
-                        printf("kmp: bad processor entry #%d, will not send IPI to myself\n", i);
+                        printf("%s: bad processor entry #%d, will not send IPI to myself\n", __FUNCTION__, i);
                         continue;
                 }
@@ -154 +153 @@
                          * supposed to wake us up.
                          */
-                        waitq_sleep(&ap_completion_wq);
+                        if (waitq_sleep_timeout(&ap_completion_wq, 1000000, SYNCH_BLOCKING) == ESYNCH_TIMEOUT)
+                                printf("%s: waiting for cpu%d (APIC ID = %d) timed out\n", __FUNCTION__, config.cpu_active > i ? config.cpu_active : i, ops->cpu_apic_id(i));
                 }
                 else {

arch/ppc/include/byteorder.h

@@ -32 +32 @@
 #include <arch/types.h>
 
-/** Convert little-endian parameter to host endianess
+/** Convert little-endian __native to host __native
  *
- * Convert little-endian to host endianess,
+ * Convert little-endian __native parameter to host endianess.
  *
- * @param n Little-endian native argument.
+ * @param n Little-endian __native argument.
  *
  * @return Result in host endianess.