Changeset 10c071e in mainline for arch/sparc64/src

Timestamp:

2005-12-15T16:57:48Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6c68b97

Parents:

b4cad8b2

Message:

Fix ia64 and sparc64 to compile with new atomic_t.
Fix rwlock test #5 and semaphore test #1 to compile with new atomic_t.

sparc64 work.
TBA must be set before a function call when MMU is switched off.

Location:

arch/sparc64/src

Files:

• mm/tlb.c (modified) (3 diffs)
• sparc64.c (modified) (2 diffs)
• trap.c (modified) (2 diffs)

arch/sparc64/src/mm/tlb.c

@@ -36 +36 @@
 #include <typedefs.h>
 #include <config.h>
+#include <arch/trap.h>
 
 /** Initialize ITLB and DTLB.
@@ -44 +45 @@
  * After TLB is initialized, MMU is enabled
  * again.
+ *
+ * Switching MMU off imposes the requirement for
+ * the kernel to run in identity mapped environment.
  */
 void tlb_arch_init(void)
@@ -82 +86 @@
         dtlb_data_in_write(data.value);
 
+        /*
+         * Register window traps can occur before MMU is enabled again.
+         * This ensures that any such traps will be handled from 
+         * kernel identity mapped trap handler.
+         */
+        trap_switch_trap_table();
+        
         tlb_invalidate_all();
 

arch/sparc64/src/sparc64.c

@@ -36 +36 @@
 {
         ofw_sparc64_console_init();
+        trap_init();
 }
 
@@ -44 +45 @@
 void arch_pre_smp_init(void)
 {
-        trap_init();
 }
 

arch/sparc64/src/trap.c

@@ -32 +32 @@
 #include <memstr.h>
 
+/** Initialize trap table. */
 void trap_init(void)
 {
@@ -38 +39 @@
          */
         memcpy((void *) trap_table, (void *) tba_read(), TRAP_TABLE_SIZE);
-
-        /* Point TBA to kernel copy of OFW's trap table. */
-        tba_write((__u64) trap_table);
 }