Changeset 7f341820 in mainline for kernel/arch/mips32/include

Timestamp:

2009-02-17T14:09:31Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

30e2bba

Parents:

85156d3

Message:

mips32: basic SMP support

Location:

kernel/arch/mips32/include

Files:

• asm.h (modified) (3 diffs)
• atomic.h (modified) (2 diffs)
• cpu.h (modified) (1 diff)
• interrupt.h (modified) (1 diff)
• smp/dorder.h (moved) (moved from kernel/arch/mips32/include/smp/order.h ) (1 diff)

kernel/arch/mips32/include/asm.h

@@ -56 +56 @@
         uintptr_t v;
         
-        asm volatile ("and %0, $29, %1\n" : "=r" (v) : "r" (~(STACK_SIZE-1)));
+        asm volatile (
+                "and %0, $29, %1\n"
+                : "=r" (v)
+                : "r" (~(STACK_SIZE-1))
+        );
         
         return v;
@@ -64 +68 @@
 extern void asm_delay_loop(uint32_t t);
 extern void userspace_asm(uintptr_t ustack, uintptr_t uspace_uarg,
-                          uintptr_t entry);
+    uintptr_t entry);
 
 extern ipl_t interrupts_disable(void);
@@ -70 +74 @@
 extern void interrupts_restore(ipl_t ipl);
 extern ipl_t interrupts_read(void);
+extern void asm_delay_loop(uint32_t t);
 
 static inline void pio_write_8(ioport_t port, uint8_t v)

kernel/arch/mips32/include/atomic.h

@@ -36 +36 @@
 #define KERN_mips32_ATOMIC_H_
 
-#define atomic_inc(x)   ((void) atomic_add(x, 1))
-#define atomic_dec(x)   ((void) atomic_add(x, -1))
+#define atomic_inc(x)  ((void) atomic_add(x, 1))
+#define atomic_dec(x)  ((void) atomic_add(x, -1))
 
-#define atomic_postinc(x) (atomic_add(x, 1) - 1)
-#define atomic_postdec(x) (atomic_add(x, -1) + 1)
+#define atomic_postinc(x)  (atomic_add(x, 1) - 1)
+#define atomic_postdec(x)  (atomic_add(x, -1) + 1)
 
-#define atomic_preinc(x) atomic_add(x, 1)
-#define atomic_predec(x) atomic_add(x, -1)
+#define atomic_preinc(x)  atomic_add(x, 1)
+#define atomic_predec(x)  atomic_add(x, -1)
 
 /* Atomic addition of immediate value.
@@ -55 +55 @@
 {
         long tmp, v;
-
+        
         asm volatile (
                 "1:\n"
                 "       ll %0, %1\n"
-                "       addu %0, %0, %3\n"      /* same as addi, but never traps on overflow */
-                "       move %2, %0\n"
+                "       addu %0, %0, %3\n"  /* same as addi, but never traps on overflow */
+                "       move %2, %0\n"
                 "       sc %0, %1\n"
-                "       beq %0, %4, 1b\n"       /* if the atomic operation failed, try again */
+                "       beq %0, %4, 1b\n"   /* if the atomic operation failed, try again */
                 "       nop\n"
                 : "=&r" (tmp), "+m" (val->count), "=&r" (v)
                 : "r" (i), "i" (0)
-                );
+        );
+        
+        return v;
+}
 
+static inline uint32_t test_and_set(atomic_t *val) {
+        uint32_t tmp, v;
+        
+        asm volatile (
+                "1:\n"
+                "       ll %2, %1\n"
+                "       bnez %2, 2f\n"
+                "       li %0, %3\n"
+                "       sc %0, %1\n"
+                "       beqz %0, 1b\n"
+                "2:\n"
+                : "=&r" (tmp), "+m" (val->count), "=&r" (v)
+                : "i" (1)
+        );
+        
         return v;
 }

kernel/arch/mips32/include/cpu.h

@@ -43 +43 @@
         uint32_t rev_num;
 } cpu_arch_t;
-        
+
 #endif
 

kernel/arch/mips32/include/interrupt.h

@@ -39 +39 @@
 #include <arch/exception.h>
 
-#define IVT_ITEMS 32
-#define IVT_FIRST 0
+#define IVT_ITEMS  32
+#define IVT_FIRST  0
+
+#define VECTOR_TLB_SHOOTDOWN_IPI  EXC_Int
 
 extern function virtual_timer_fnc;

kernel/arch/mips32/include/smp/dorder.h

@@ -27 +27 @@
  */
 
-#ifndef KERN_mips32_ORDER_H_
-#define KERN_mips32_ORDER_H_
+#ifndef KERN_mips32_DORDER_H_
+#define KERN_mips32_DORDER_H_
 
 extern void ipi_broadcast_arch(int ipi);