Changeset a9ac978 in mainline for kernel/arch/sparc64/include

Timestamp:

2006-09-27T20:11:34Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00b38a3

Parents:

86b31ba9

Message:

SMP stuff for sparc64.
Almost complete except for IPIs.
The absence of IPI support deadlocks
the kernel when more CPUs are configured.

Location:

kernel/arch/sparc64/include

Files:

• atomic.h (modified) (3 diffs)
• cpu.h (modified) (2 diffs)
• interrupt.h (modified) (1 diff)
• regdef.h (modified) (1 diff)

kernel/arch/sparc64/include/atomic.h

@@ -97 +97 @@
 {
         uint64_t v = 1;
+        volatile uintptr_t x = (uint64_t) &val->count;
 
-        __asm__ volatile ("casx %0, %2, %1\n" : "+m" (*val), "+r" (v) : "r" (0));
+        __asm__ volatile ("casx %0, %2, %1\n" : "+m" (*((uint64_t *) x)), "+r" (v) : "r" (0));
 
         return v;
@@ -107 +108 @@
         uint64_t tmp1 = 1;
         uint64_t tmp2;
+
+        volatile uintptr_t x = (uint64_t) &val->count;
 
         __asm__ volatile (
@@ -120 +123 @@
                 "nop\n"
         "2:\n"
-                : "+m" (*val), "+r" (tmp1), "+r" (tmp2) : "r" (0)
+                : "+m" (*((uint64_t *) x)), "+r" (tmp1), "+r" (tmp2) : "r" (0)
         );
         

kernel/arch/sparc64/include/cpu.h

@@ -36 +36 @@
 #define KERN_sparc64_CPU_H_
 
+#include <arch/types.h>
 #include <arch/register.h>
 
@@ -52 +53 @@
 
 struct cpu_arch {
+        uint32_t mid;                   /**< Processor ID as read from UPA_CONFIG. */
         ver_reg_t ver;
-        uint32_t clock_frequency;
+        uint32_t clock_frequency;       /**< Processor frequency in MHz. */
 };
         

kernel/arch/sparc64/include/interrupt.h

@@ -41 +41 @@
 #include <arch/regdef.h>
 
-#define IRQ_COUNT       1       /* TODO */
+#define IRQ_COUNT       1                       /* TODO */
 
 #define IVT_ITEMS       15
 #define IVT_FIRST       1
+
+#define VECTOR_TLB_SHOOTDOWN_IPI        0       /* TODO */
 
 struct istate {

kernel/arch/sparc64/include/regdef.h

@@ -56 +56 @@
 #define WSTATE_OTHER(n)         ((n)<<3)
 
+#define UPA_CONFIG_MID_SHIFT    17
+#define UPA_CONFIG_MID_MASK     0x1f
+
 #endif