Changeset 36e7ee98 in mainline

Timestamp:

2005-12-15T21:32:12Z (19 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.

Files:

• arch/ia32/include/atomic.h (modified) (2 diffs)
• arch/mips32/src/debugger.c (modified) (1 diff)
• generic/include/func.h (modified) (1 diff)
• generic/src/console/console.c (modified) (3 diffs)
• generic/src/lib/func.c (modified) (2 diffs)
• generic/src/proc/scheduler.c (modified) (1 diff)

arch/ia32/include/atomic.h

@@ -32 +32 @@
 #include <arch/types.h>
 
-typedef struct { volatile __u32 count; } atomic_t;
+typedef struct { volatile __u64 count; } atomic_t;
 
-static inline void atomic_set(atomic_t *val, __u32 i)
+static inline void atomic_set(atomic_t *val, __u64 i)
 {
         val->count = i;
 }
 
-static inline __u32 atomic_get(atomic_t *val)
+static inline __u64 atomic_get(atomic_t *val)
 {
         return val->count;
@@ -80 +80 @@
                 "movl $-1, %0\n"
                 "lock xaddl %0, %1\n"
-                : "=r" (r), "=m" (*val)
+                : "=r" (r), "=m" (val->count)
         );
         

arch/mips32/src/debugger.c

@@ -257 +257 @@
         printf("***Type 'exit' to exit kconsole.\n");
         /* Umm..we should rather set some 'debugstate' here */
-        haltstate = 1;
+        atomic_set(&haltstate,1);
         kconsole("debug");
-        haltstate = 0;
-}
+        atomic_set(&haltstate,0);
+}

generic/include/func.h

@@ -32 +32 @@
 #include <arch/types.h>
 #include <typedefs.h>
+#include <arch/atomic.h>
 
-extern volatile __u32 haltstate;
+extern atomic_t haltstate;
 
 extern void halt(void);

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();