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

Timestamp:

2009-02-17T14:09:31Z (16 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/src

Files:

• asm.S (modified) (2 diffs)
• debugger.c (modified) (2 diffs)
• dummy.S (deleted)
• interrupt.c (modified) (1 diff)
• mips32.c (modified) (1 diff)
• mm/tlb.c (modified) (3 diffs)
• smp/dorder.c (moved) (moved from kernel/arch/mips32/src/smp/order.c ) (2 diffs)
• smp/smp.c (added)

kernel/arch/mips32/src/asm.S

@@ -28 +28 @@
 
 #include <arch/asm/regname.h>
-        
+
 .text
 
@@ -46 +46 @@
 .set noreorder
 .set nomacro
+
+.global asm_delay_loop
+asm_delay_loop:
+        j $31
+        nop
 
 .global cpu_halt

kernel/arch/mips32/src/debugger.c

@@ -163 +163 @@
                 if (breakpoints[i].address == (uintptr_t)argv->intval) {
                         printf("Duplicate breakpoint %d.\n", i);
-                        spinlock_unlock(&bkpoints_lock);
+                        spinlock_unlock(&bkpoint_lock);
                         return 0;
                 } else if (breakpoints[i].address == (uintptr_t)argv->intval +
@@ -170 +170 @@
                         printf("Adjacent breakpoints not supported, conflict "
                             "with %d.\n", i);
-                        spinlock_unlock(&bkpoints_lock);
+                        spinlock_unlock(&bkpoint_lock);
                         return 0;
                 }
-                        
+                
         }
 

kernel/arch/mips32/src/interrupt.c

@@ -42 +42 @@
 #include <ddi/device.h>
 
-#define IRQ_COUNT 8
-#define TIMER_IRQ 7
+#define IRQ_COUNT   8
+#define TIMER_IRQ   7
+#define DORDER_IRQ  5
 
 function virtual_timer_fnc = NULL;

kernel/arch/mips32/src/mips32.c

@@ -167 +167 @@
 }
 
+void calibrate_delay_loop(void)
+{
+}
+
 void userspace(uspace_arg_t *kernel_uarg)
 {

kernel/arch/mips32/src/mm/tlb.c

@@ -27 +27 @@
  */
 
-/** @addtogroup mips32mm        
+/** @addtogroup mips32mm
  * @{
  */
@@ -42 +42 @@
 #include <arch.h>
 #include <symtab.h>
-#include <synch/spinlock.h>
+#include <synch/mutex.h>
 #include <print.h>
 #include <debug.h>
@@ -93 +93 @@
         pte_t *pte;
         int pfrc;
-
+        
         badvaddr = cp0_badvaddr_read();
-
-        spinlock_lock(&AS->lock);
+        
+        mutex_lock(&AS->lock);
         asid = AS->asid;
-        spinlock_unlock(&AS->lock);
-
+        mutex_unlock(&AS->lock);
+        
         page_table_lock(AS, true);
-
+        
         pte = find_mapping_and_check(badvaddr, PF_ACCESS_READ, istate, &pfrc);
         if (!pte) {

kernel/arch/mips32/src/smp/dorder.c

@@ -27 +27 @@
  */
 
-/** @addtogroup mips32  
+/** @addtogroup mips32
  * @{
  */
@@ -33 +33 @@
  */
 
-#include <arch/smp/order.h>
+#include <arch/smp/dorder.h>
 
-#define MSIM_ORDER_ADDRESS      0xB0000004
+#define MSIM_DORDER_ADDRESS  0xB0000004
 
 void ipi_broadcast_arch(int ipi)
 {
-        *((volatile unsigned int *) MSIM_ORDER_ADDRESS) = 0x7FFFFFFF;
+#ifdef CONFIG_SMP
+        *((volatile unsigned int *) MSIM_DORDER_ADDRESS) = 0x7FFFFFFF;
+#endif
 }