Changeset cc106e4 in mainline

Timestamp:

2012-11-07T18:44:33Z (11 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

fc89e32

Parents:

2708f6a

Message:

Fixed build for sparc64/ultra, sparc64/niagara, ppc32, mips32/GXemul.

Location:

kernel

Files:

• arch/sparc64/Makefile.inc (modified) (1 diff)
• arch/sparc64/include/interrupt.h (modified) (1 diff)
• arch/sparc64/include/smp/sun4u/ipi.h (added)
• arch/sparc64/src/debug/stacktrace.c (modified) (1 diff)
• arch/sparc64/src/smp/sun4u/ipi.c (modified) (3 diffs)
• arch/sparc64/src/smp/sun4u/smp_call.c (added)
• generic/include/synch/condvar.h (modified) (2 diffs)
• generic/include/synch/spinlock.h (modified) (3 diffs)
• generic/src/smp/smp_call.c (modified) (1 diff)
• generic/src/synch/condvar.c (modified) (1 diff)
• generic/src/synch/rcu.c (modified) (1 diff)

kernel/arch/sparc64/Makefile.inc

@@ -101 +101 @@
         ARCH_SOURCES += \
                 arch/$(KARCH)/src/smp/$(USARCH)/smp.c \
+                arch/$(KARCH)/src/smp/$(USARCH)/smp_call.c \
                 arch/$(KARCH)/src/smp/$(USARCH)/ipi.c
 endif

kernel/arch/sparc64/include/interrupt.h

@@ -47 +47 @@
 
 enum {
-        IPI_TLB_SHOOTDOWN = VECTOR_TLB_SHOOTDOWN_IPI
+        IPI_TLB_SHOOTDOWN = VECTOR_TLB_SHOOTDOWN_IPI,
+        IPI_SMP_CALL
 };
 

kernel/arch/sparc64/src/debug/stacktrace.c

@@ -36 +36 @@
 #include <syscall/copy.h>
 #include <typedefs.h>
+#include <proc/thread.h>
 
 #include <arch.h>

kernel/arch/sparc64/src/smp/sun4u/ipi.c

@@ -34 +34 @@
 
 #include <smp/ipi.h>
+#include <arch/smp/sun4u/ipi.h>
 #include <cpu.h>
 #include <arch.h>
@@ -40 +41 @@
 #include <config.h>
 #include <mm/tlb.h>
+#include <smp/smp_call.h>
 #include <arch/interrupt.h>
 #include <arch/trap/interrupt.h>
@@ -171 +173 @@
 }
 
+
+/*
+ * Deliver an IPI to the specified processors (except the current one).
+ *
+ * Interrupts must be disabled.
+ *
+ * @param cpu_id Destination cpu id (index into cpus array). Must not 
+ *               be the current cpu.
+ * @param ipi    IPI number.
+ */
+void ipi_unicast_arch(unsigned int cpu_id, int ipi)
+{
+        ASSERT(&cpus[cpu_id] != CPU);
+        
+        if (ipi == IPI_SMP_CALL) {
+                cross_call(cpus[cpu_id].arch.mid, smp_call_ipi_recv);
+        } else {
+                panic("Unknown IPI (%d).\n", ipi);
+                return;
+        }
+}
+
 /** @}
  */

kernel/generic/include/synch/condvar.h

@@ -51 +51 @@
         _condvar_wait_timeout((cv), (mtx), (usec), SYNCH_FLAGS_NONE)
 
+#ifdef CONFIG_SMP
+#define _condvar_wait_timeout_spinlock(cv, lock, usec, flags) \
+        _condvar_wait_timeout_spinlock_impl((cv), (lock), (usec), (flags))
+#else
+#define _condvar_wait_timeout_spinlock(cv, lock, usec, flags) \
+        _condvar_wait_timeout_spinlock_impl((cv), NULL, (usec), (flags))
+#endif
+
 extern void condvar_initialize(condvar_t *cv);
 extern void condvar_signal(condvar_t *cv);
@@ -56 +64 @@
 extern int _condvar_wait_timeout(condvar_t *cv, mutex_t *mtx, uint32_t usec,
     int flags);
-extern int _condvar_wait_timeout_spinlock(condvar_t *cv, spinlock_t *lock, 
+extern int _condvar_wait_timeout_spinlock_impl(condvar_t *cv, spinlock_t *lock, 
         uint32_t usec, int flags);
 extern int _condvar_wait_timeout_irq_spinlock(condvar_t *cv, 

kernel/generic/include/synch/spinlock.h

@@ -45 +45 @@
 #ifdef CONFIG_SMP
 
-typedef struct {
+typedef struct spinlock {
         atomic_t val;
         
@@ -162 +162 @@
 /* On UP systems, spinlocks are effectively left out. */
 
+/* Allow the use of spinlock_t as an incomplete type. */
+typedef struct spinlock spinlock_t;
+
 #define SPINLOCK_DECLARE(name)
 #define SPINLOCK_EXTERN(name)
@@ -176 +179 @@
 
 #define spinlock_lock(lock)     preemption_disable()
-#define spinlock_trylock(lock)  (preemption_disable(), 1)
+#define spinlock_trylock(lock)  ({ preemption_disable(); 1; })
 #define spinlock_unlock(lock)   preemption_enable()
 #define spinlock_locked(lock)   1

kernel/generic/src/smp/smp_call.c

@@ -131 +131 @@
                 /*
                  * If a platform supports SMP it must implement arch_smp_call_ipi().
-                 * It should issue an IPI an cpu_id and invoke smp_call_ipi_recv()
+                 * It should issue an IPI on cpu_id and invoke smp_call_ipi_recv()
                  * on cpu_id in turn. 
                  * 

kernel/generic/src/synch/condvar.c

@@ -120 +120 @@
  * @return See comment for waitq_sleep_timeout().
  */
-int _condvar_wait_timeout_spinlock(condvar_t *cv, spinlock_t *lock, 
+int _condvar_wait_timeout_spinlock_impl(condvar_t *cv, spinlock_t *lock, 
         uint32_t usec, int flags)
 {

kernel/generic/src/synch/rcu.c

@@ -861 +861 @@
                         
                         /* Wait for the GP to complete. */
-                        int ret = _condvar_wait_timeout_spinlock(&rcu.gp_ended, 
-                                &rcu.gp_lock, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE);
+                        int ret = _condvar_wait_timeout_spinlock(&rcu.gp_ended, &rcu.gp_lock, 
+                                SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE);
                         
                         if (ret == ESYNCH_INTERRUPTED) {