Changeset 36e7ee98 in mainline for generic/src

Timestamp:

2005-12-15T21:32:12Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

cddc1639

Parents:

49b6d32

Message:

Fixed cpu halting in debug panic mode.

Location:

generic/src

Files:

• console/console.c (modified) (3 diffs)
• lib/func.c (modified) (2 diffs)
• proc/scheduler.c (modified) (1 diff)

generic/src/console/console.c

@@ -37 +37 @@
 #include <func.h>
 #include <print.h>
+#include <arch/atomic.h>
 
 /** Standard input character device. */
@@ -53 +54 @@
         ipl_t ipl;
 
-        if (haltstate) {
+        if (atomic_get(&haltstate)) {
                 /* If we are here, we are hopefully on the processor, that 
                  * issued the 'halt' command, so proceed to read the character
@@ -61 +62 @@
                         return chardev->op->read(chardev);
                 /* no other way of interacting with user, halt */
-                printf("cpu: halted - no kconsole\n");
+                if (CPU)
+                        printf("cpu%d: ", CPU->id);
+                else
+                        printf("cpu: ");
+                printf("halted - no kconsole\n");
                 cpu_halt();
         }

generic/src/lib/func.c

@@ -35 +35 @@
 #include <console/kconsole.h>
 
-__u32 volatile haltstate = 0; /**< Halt flag */
+atomic_t haltstate = {0}; /**< Halt flag */
 
 
@@ -43 +43 @@
  *
  */
-void halt(void)
+void halt()
 {
-        haltstate = 1;
+#ifdef CONFIG_DEBUG
+        bool rundebugger;
+
+//      TODO test_and_set not defined on all arches
+//      if (!test_and_set(&haltstate))
+        if (!atomic_get(&haltstate)) {
+                atomic_set(&haltstate, 1);
+                rundebugger = true;
+        }
+#else
+        atomic_set(haltstate, 1);
+#endif
+
         interrupts_disable();
 #ifdef CONFIG_DEBUG
-        printf("\n");
-        kconsole("panic"); /* Run kconsole as a last resort to user */
+        if (rundebugger) {
+                printf("\n");
+                kconsole("panic"); /* Run kconsole as a last resort to user */
+        }
 #endif      
-
         if (CPU)
                 printf("cpu%d: halted\n", CPU->id);

generic/src/proc/scheduler.c

@@ -407 +407 @@
         ipl = interrupts_disable();
 
-        if (haltstate)
+        if (atomic_get(&haltstate))
                 halt();