Changeset 82a04c6 in mainline

Timestamp:

2009-12-07T21:55:56Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a47d49f

Parents:

45d5f86

Message:

Support for RAS on arm32.

Files:

• kernel/arch/arm32/Makefile.inc (modified) (1 diff)
• kernel/arch/arm32/include/ras.h (added)
• kernel/arch/arm32/src/arm32.c (modified) (2 diffs)
• kernel/arch/arm32/src/exc_handler.S (modified) (7 diffs)
• kernel/arch/arm32/src/ras.c (added)
• kernel/arch/arm32/src/userspace.c (modified) (2 diffs)
• uspace/lib/libc/arch/arm32/src/entry.s (modified) (2 diffs)
• uspace/srv/loader/arch/arm32/arm32.s (modified) (1 diff)

kernel/arch/arm32/Makefile.inc

@@ -61 +61 @@
         arch/$(KARCH)/src/mm/page.c \
         arch/$(KARCH)/src/mm/tlb.c \
-        arch/$(KARCH)/src/mm/page_fault.c
+        arch/$(KARCH)/src/mm/page_fault.c \
+        arch/$(KARCH)/src/ras.c
 
 ifeq ($(MACHINE),testarm)

kernel/arch/arm32/src/arm32.c

@@ -48 +48 @@
 #include <macros.h>
 #include <string.h>
+#include <arch/ras.h>
 
 #ifdef MACHINE_testarm
@@ -88 +89 @@
         exception_init();
         interrupt_init();
+
+        /* Initialize Restartable Atomic Sequences support. */
+        ras_init();
         
         machine_output_init();

kernel/arch/arm32/src/exc_handler.S

@@ -148 +148 @@
         mov r0, #0
         mov r1, r13
-        bl exc_dispatch
+        bl ras_check 
         LOAD_REGS_FROM_STACK
 
@@ -156 +156 @@
         mov r0, #5
         mov r1, r13
-        bl exc_dispatch
+        bl ras_check 
         LOAD_REGS_FROM_STACK
 
@@ -164 +164 @@
         mov r0, #6
         mov r1, r13
-        bl exc_dispatch
+        bl ras_check 
         LOAD_REGS_FROM_STACK
 
@@ -171 +171 @@
         mov r0, #1
         mov r1, r13
-        bl exc_dispatch
+        bl ras_check 
         LOAD_REGS_FROM_STACK
 
@@ -179 +179 @@
         mov r0, #3
         mov r1, r13
-        bl exc_dispatch
+        bl ras_check 
         LOAD_REGS_FROM_STACK
 
@@ -187 +187 @@
         mov r0, #4
         mov r1, r13
-        bl exc_dispatch
+        bl ras_check 
         LOAD_REGS_FROM_STACK
 
@@ -195 +195 @@
         mov r0, #2
         mov r1, r13
-        bl exc_dispatch
+        bl ras_check
         LOAD_REGS_FROM_STACK
 

kernel/arch/arm32/src/userspace.c

@@ -35 +35 @@
 
 #include <userspace.h>
+#include <arch/ras.h>
 
 /** Struct for holding all general purpose registers.
@@ -74 +75 @@
         ustate.r1 = 0;
 
+        /* pass the RAS page address in %r2 */
+        ustate.r2 = (uintptr_t) ras_page;
+
         /* clear other registers */
-        ustate.r2 = ustate.r3  = ustate.r4  = ustate.r5 =
-            ustate.r6  = ustate.r7  = ustate.r8  = ustate.r9 = ustate.r10 = 
-            ustate.r11 = ustate.r12 = ustate.lr = 0;
+        ustate.r3  = ustate.r4  = ustate.r5 = ustate.r6 = ustate.r7 =
+            ustate.r8 = ustate.r9 = ustate.r10 = ustate.r11 = ustate.r12 =
+            ustate.lr = 0;
 
         /* set user stack */

uspace/lib/libc/arch/arm32/src/entry.s

@@ -36 +36 @@
 #
 # r1 contains the PCB pointer
+# r2 contains the RAS page address
 #
 __entry:
+        # Store the RAS page address into the ras_page variable
+        ldr r0, =ras_page
+        str r2, [r0]
+
         # Pass pcb_ptr to __main as the first argument (in r0)
         mov r0, r1
@@ -43 +48 @@
 
         bl __exit
+
+.data
+
+.global ras_page
+ras_page:
+        .long 0
+

uspace/srv/loader/arch/arm32/arm32.s

@@ -36 +36 @@
 # Jump to a program entry point
 program_run:
+        # load ras_page address to r2
+        ldr r2, =ras_page
+        ldr r2, [r2]
         # pcb is passed to the entry point in r1 (where it already is)
         mov r15, r0