Ticket #4115: ppc-isync-relocation-final.diff

src/system/kernel/arch/ppc/arch_elf.cpp

@@ -197 +197 @@
                         "addend 0x%lx\n", __FUNCTION__, i, ELF32_R_TYPE(rel[i].r_info),
                         rel[i].r_offset, ELF32_R_SYM(rel[i].r_info),
                         rel[i].r_addend);
+                    #ifndef _BOOT_MODE // We only need to return if this is during runtime.
                     return vlErr;
+                    #endif
                 }
                 break;
         }

src/system/kernel/arch/ppc/arch_cpu_asm.S

@@ -31 +31 @@
  *             r3                    r4
  */
 FUNCTION(set_sr):
+    isync
     mtsrin  %r4, %r3
+    isync
     blr
 
 /* uint32 get_msr(void);
@@ -45 +47 @@
  */
 FUNCTION(set_msr):
     mtmsr   %r3
+    isync
     blr
 
 /* uint32 get_pvr(void);

src/system/kernel/arch/ppc/arch_cpu.cpp

@@ -48 +48 @@
 }
 
 status_t
+arch_cpu_init_percpu(kernel_args *args, int curr_cpu)
+{
+        //detect_cpu(curr_cpu);
+
+        // we only support one on ppc anyway at the moment...
+        return 0;
+}
+
+status_t
 arch_cpu_init_post_modules(kernel_args *args)
 {
     return B_OK;

src/system/kernel/arch/ppc/arch_asm.S

@@ -26 +26 @@
         // sets bit 15, EE
 
     mtmsr   %r3                         // put it back into the msr
+    isync
     blr
 
 
@@ -40 +41 @@
         // clears bit 15, EE
 
     mtmsr   %r4                         // put it back into the msr
+    isync
     blr
 
 
@@ -53 +55 @@
         // clear or set bit 15, EE to the same state as in r3, oldState
 
     mtmsr   %r4
+    isync
     blr
 
 /* bool arch_int_are_interrupts_enabled(void) */
@@ -175 +178 @@
 
 // void sethid0(unsigned int val);
 FUNCTION(sethid0):
+    isync
     mtspr       1008, %r3
+    isync
     blr
 
 // unsigned int getl2cr();
@@ -185 +190 @@
 
 // void setl2cr(unsigned int val);
 FUNCTION(setl2cr):
+    isync
     mtspr       1017, %r3
+    isync
     blr
 
     

src/system/boot/platform/openfirmware/arch/ppc/mmu.cpp

@@ -991 +991 @@
     // set up new page table and turn on translation again
 
     for (int32 i = 0; i < 16; i++) {
-        isync();
-
         ppc_set_segment_register((void *)(i * 0x10000000), sSegments[i]);
             // one segment describes 256 MB of memory
-
-        ppc_sync();
     }
 
     ppc_set_page_table(physicalTable, tableSize);

headers/private/kernel/user_atomic.h

@@ -9 +9 @@
  * in userspace, they are implemented as these syscalls.
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int32 _user_atomic_set(vint32 *value, int32 newValue);
 int32 _user_atomic_test_and_set(vint32 *value, int32 newValue, int32 testAgainst);
 int32 _user_atomic_add(vint32 *value, int32 addValue);
@@ -23 +27 @@
 int64 _user_atomic_or64(vint64 *value, int64 orValue);  
 int64 _user_atomic_get64(vint64 *value);
 
+#ifdef __cplusplus
+}
+#endif
+
+
 #endif  /* _KERNEL_USER_ATOMIC_H */