Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / include / asm-mips / spinlock.h
index d2575ae..669b8e3 100644 (file)
@@ -9,20 +9,16 @@
 #ifndef _ASM_SPINLOCK_H
 #define _ASM_SPINLOCK_H
 
+#include <asm/war.h>
+
 /*
  * Your basic SMP spinlocks, allowing only a single CPU anywhere
  */
 
-typedef struct {
-       volatile unsigned int lock;
-} spinlock_t;
-
-#define SPIN_LOCK_UNLOCKED (spinlock_t) { 0 }
-
-#define spin_lock_init(x)      do { (x)->lock = 0; } while(0)
-
-#define spin_is_locked(x)      ((x)->lock != 0)
-#define spin_unlock_wait(x)    do { barrier(); } while ((x)->lock)
+#define __raw_spin_is_locked(x)       ((x)->lock != 0)
+#define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
+#define __raw_spin_unlock_wait(x) \
+       do { cpu_relax(); } while ((x)->lock)
 
 /*
  * Simple spin lock operations.  There are two variants, one clears IRQ's
@@ -31,51 +27,84 @@ typedef struct {
  * We make no fairness assumptions.  They have a cost.
  */
 
-static inline void _raw_spin_lock(spinlock_t *lock)
+static inline void __raw_spin_lock(raw_spinlock_t *lock)
 {
        unsigned int tmp;
 
-       __asm__ __volatile__(
-       ".set\tnoreorder\t\t\t# _raw_spin_lock\n"
-       "1:\tll\t%1, %2\n\t"
-       "bnez\t%1, 1b\n\t"
-       " li\t%1, 1\n\t"
-       "sc\t%1, %0\n\t"
-       "beqz\t%1, 1b\n\t"
-       " sync\n\t"
-       ".set\treorder"
-       : "=m" (lock->lock), "=&r" (tmp)
-       : "m" (lock->lock)
-       : "memory");
+       if (R10000_LLSC_WAR) {
+               __asm__ __volatile__(
+               "       .set    noreorder       # __raw_spin_lock       \n"
+               "1:     ll      %1, %2                                  \n"
+               "       bnez    %1, 1b                                  \n"
+               "        li     %1, 1                                   \n"
+               "       sc      %1, %0                                  \n"
+               "       beqzl   %1, 1b                                  \n"
+               "        nop                                            \n"
+               "       sync                                            \n"
+               "       .set    reorder                                 \n"
+               : "=m" (lock->lock), "=&r" (tmp)
+               : "m" (lock->lock)
+               : "memory");
+       } else {
+               __asm__ __volatile__(
+               "       .set    noreorder       # __raw_spin_lock       \n"
+               "1:     ll      %1, %2                                  \n"
+               "       bnez    %1, 1b                                  \n"
+               "        li     %1, 1                                   \n"
+               "       sc      %1, %0                                  \n"
+               "       beqz    %1, 1b                                  \n"
+               "        sync                                           \n"
+               "       .set    reorder                                 \n"
+               : "=m" (lock->lock), "=&r" (tmp)
+               : "m" (lock->lock)
+               : "memory");
+       }
 }
 
-static inline void _raw_spin_unlock(spinlock_t *lock)
+static inline void __raw_spin_unlock(raw_spinlock_t *lock)
 {
        __asm__ __volatile__(
-       ".set\tnoreorder\t\t\t# _raw_spin_unlock\n\t"
-       "sync\n\t"
-       "sw\t$0, %0\n\t"
-       ".set\treorder"
+       "       .set    noreorder       # __raw_spin_unlock     \n"
+       "       sync                                            \n"
+       "       sw      $0, %0                                  \n"
+       "       .set\treorder                                   \n"
        : "=m" (lock->lock)
        : "m" (lock->lock)
        : "memory");
 }
 
-static inline unsigned int _raw_spin_trylock(spinlock_t *lock)
+static inline unsigned int __raw_spin_trylock(raw_spinlock_t *lock)
 {
        unsigned int temp, res;
 
-       __asm__ __volatile__(
-       ".set\tnoreorder\t\t\t# _raw_spin_trylock\n\t"
-       "1:\tll\t%0, %3\n\t"
-       "ori\t%2, %0, 1\n\t"
-       "sc\t%2, %1\n\t"
-       "beqz\t%2, 1b\n\t"
-       " andi\t%2, %0, 1\n\t"
-       ".set\treorder"
-       : "=&r" (temp), "=m" (lock->lock), "=&r" (res)
-       : "m" (lock->lock)
-       : "memory");
+       if (R10000_LLSC_WAR) {
+               __asm__ __volatile__(
+               "       .set    noreorder       # __raw_spin_trylock    \n"
+               "1:     ll      %0, %3                                  \n"
+               "       ori     %2, %0, 1                               \n"
+               "       sc      %2, %1                                  \n"
+               "       beqzl   %2, 1b                                  \n"
+               "        nop                                            \n"
+               "       andi    %2, %0, 1                               \n"
+               "       sync                                            \n"
+               "       .set    reorder"
+               : "=&r" (temp), "=m" (lock->lock), "=&r" (res)
+               : "m" (lock->lock)
+               : "memory");
+       } else {
+               __asm__ __volatile__(
+               "       .set    noreorder       # __raw_spin_trylock    \n"
+               "1:     ll      %0, %3                                  \n"
+               "       ori     %2, %0, 1                               \n"
+               "       sc      %2, %1                                  \n"
+               "       beqz    %2, 1b                                  \n"
+               "        andi   %2, %0, 1                               \n"
+               "       sync                                            \n"
+               "       .set    reorder"
+               : "=&r" (temp), "=m" (lock->lock), "=&r" (res)
+               : "m" (lock->lock)
+               : "memory");
+       }
 
        return res == 0;
 }
@@ -89,104 +118,167 @@ static inline unsigned int _raw_spin_trylock(spinlock_t *lock)
  * read-locks.
  */
 
-typedef struct {
-       volatile unsigned int lock;
-} rwlock_t;
-
-#define RW_LOCK_UNLOCKED (rwlock_t) { 0 }
-
-#define rwlock_init(x)  do { *(x) = RW_LOCK_UNLOCKED; } while(0)
+/*
+ * read_can_lock - would read_trylock() succeed?
+ * @lock: the rwlock in question.
+ */
+#define __raw_read_can_lock(rw)        ((rw)->lock >= 0)
 
-#define rwlock_is_locked(x) ((x)->lock)
+/*
+ * write_can_lock - would write_trylock() succeed?
+ * @lock: the rwlock in question.
+ */
+#define __raw_write_can_lock(rw)       (!(rw)->lock)
 
-static inline void _raw_read_lock(rwlock_t *rw)
+static inline void __raw_read_lock(raw_rwlock_t *rw)
 {
        unsigned int tmp;
 
-       __asm__ __volatile__(
-       ".set\tnoreorder\t\t\t# _raw_read_lock\n"
-       "1:\tll\t%1, %2\n\t"
-       "bltz\t%1, 1b\n\t"
-       " addu\t%1, 1\n\t"
-       "sc\t%1, %0\n\t"
-       "beqz\t%1, 1b\n\t"
-       " sync\n\t"
-       ".set\treorder"
-       : "=m" (rw->lock), "=&r" (tmp)
-       : "m" (rw->lock)
-       : "memory");
+       if (R10000_LLSC_WAR) {
+               __asm__ __volatile__(
+               "       .set    noreorder       # __raw_read_lock       \n"
+               "1:     ll      %1, %2                                  \n"
+               "       bltz    %1, 1b                                  \n"
+               "        addu   %1, 1                                   \n"
+               "       sc      %1, %0                                  \n"
+               "       beqzl   %1, 1b                                  \n"
+               "        nop                                            \n"
+               "       sync                                            \n"
+               "       .set    reorder                                 \n"
+               : "=m" (rw->lock), "=&r" (tmp)
+               : "m" (rw->lock)
+               : "memory");
+       } else {
+               __asm__ __volatile__(
+               "       .set    noreorder       # __raw_read_lock       \n"
+               "1:     ll      %1, %2                                  \n"
+               "       bltz    %1, 1b                                  \n"
+               "        addu   %1, 1                                   \n"
+               "       sc      %1, %0                                  \n"
+               "       beqz    %1, 1b                                  \n"
+               "        sync                                           \n"
+               "       .set    reorder                                 \n"
+               : "=m" (rw->lock), "=&r" (tmp)
+               : "m" (rw->lock)
+               : "memory");
+       }
 }
 
 /* Note the use of sub, not subu which will make the kernel die with an
    overflow exception if we ever try to unlock an rwlock that is already
    unlocked or is being held by a writer.  */
-static inline void _raw_read_unlock(rwlock_t *rw)
+static inline void __raw_read_unlock(raw_rwlock_t *rw)
 {
        unsigned int tmp;
 
-       __asm__ __volatile__(
-       ".set\tnoreorder\t\t\t# _raw_read_unlock\n"
-       "1:\tll\t%1, %2\n\t"
-       "sub\t%1, 1\n\t"
-       "sc\t%1, %0\n\t"
-       "beqz\t%1, 1b\n\t"
-       " sync\n\t"
-       ".set\treorder"
-       : "=m" (rw->lock), "=&r" (tmp)
-       : "m" (rw->lock)
-       : "memory");
+       if (R10000_LLSC_WAR) {
+               __asm__ __volatile__(
+               "1:     ll      %1, %2          # __raw_read_unlock     \n"
+               "       sub     %1, 1                                   \n"
+               "       sc      %1, %0                                  \n"
+               "       beqzl   %1, 1b                                  \n"
+               "       sync                                            \n"
+               : "=m" (rw->lock), "=&r" (tmp)
+               : "m" (rw->lock)
+               : "memory");
+       } else {
+               __asm__ __volatile__(
+               "       .set    noreorder       # __raw_read_unlock     \n"
+               "1:     ll      %1, %2                                  \n"
+               "       sub     %1, 1                                   \n"
+               "       sc      %1, %0                                  \n"
+               "       beqz    %1, 1b                                  \n"
+               "        sync                                           \n"
+               "       .set    reorder                                 \n"
+               : "=m" (rw->lock), "=&r" (tmp)
+               : "m" (rw->lock)
+               : "memory");
+       }
 }
 
-static inline void _raw_write_lock(rwlock_t *rw)
+static inline void __raw_write_lock(raw_rwlock_t *rw)
 {
        unsigned int tmp;
 
-       __asm__ __volatile__(
-       ".set\tnoreorder\t\t\t# _raw_write_lock\n"
-       "1:\tll\t%1, %2\n\t"
-       "bnez\t%1, 1b\n\t"
-       " lui\t%1, 0x8000\n\t"
-       "sc\t%1, %0\n\t"
-       "beqz\t%1, 1b\n\t"
-       " sync\n\t"
-       ".set\treorder"
-       : "=m" (rw->lock), "=&r" (tmp)
-       : "m" (rw->lock)
-       : "memory");
+       if (R10000_LLSC_WAR) {
+               __asm__ __volatile__(
+               "       .set    noreorder       # __raw_write_lock      \n"
+               "1:     ll      %1, %2                                  \n"
+               "       bnez    %1, 1b                                  \n"
+               "        lui    %1, 0x8000                              \n"
+               "       sc      %1, %0                                  \n"
+               "       beqzl   %1, 1b                                  \n"
+               "        sync                                           \n"
+               "       .set    reorder                                 \n"
+               : "=m" (rw->lock), "=&r" (tmp)
+               : "m" (rw->lock)
+               : "memory");
+       } else {
+               __asm__ __volatile__(
+               "       .set    noreorder       # __raw_write_lock      \n"
+               "1:     ll      %1, %2                                  \n"
+               "       bnez    %1, 1b                                  \n"
+               "        lui    %1, 0x8000                              \n"
+               "       sc      %1, %0                                  \n"
+               "       beqz    %1, 1b                                  \n"
+               "        sync                                           \n"
+               "       .set    reorder                                 \n"
+               : "=m" (rw->lock), "=&r" (tmp)
+               : "m" (rw->lock)
+               : "memory");
+       }
 }
 
-static inline void _raw_write_unlock(rwlock_t *rw)
+static inline void __raw_write_unlock(raw_rwlock_t *rw)
 {
        __asm__ __volatile__(
-       ".set\tnoreorder\t\t\t# _raw_write_unlock\n\t"
-       "sync\n\t"
-       "sw\t$0, %0\n\t"
-       ".set\treorder"
+       "       sync                    # __raw_write_unlock    \n"
+       "       sw      $0, %0                                  \n"
        : "=m" (rw->lock)
        : "m" (rw->lock)
        : "memory");
 }
 
-static inline int _raw_write_trylock(rwlock_t *rw)
+#define __raw_read_trylock(lock) generic__raw_read_trylock(lock)
+
+static inline int __raw_write_trylock(raw_rwlock_t *rw)
 {
        unsigned int tmp;
        int ret;
 
-       __asm__ __volatile__(
-       ".set\tnoreorder\t\t\t# _raw_write_trylock\n"
-       "li\t%2, 0\n\t"
-       "1:\tll\t%1, %3\n\t"
-       "bnez\t%1, 2f\n\t"
-       "lui\t%1, 0x8000\n\t"
-       "sc\t%1, %0\n\t"
-       "beqz\t%1, 1b\n\t"
-       "sync\n\t"
-       "li\t%2, 1\n\t"
-       ".set\treorder\n"
-       "2:"
-       : "=m" (rw->lock), "=&r" (tmp), "=&r" (ret)
-       : "m" (rw->lock)
-       : "memory");
+       if (R10000_LLSC_WAR) {
+               __asm__ __volatile__(
+               "       .set    noreorder       # __raw_write_trylock   \n"
+               "       li      %2, 0                                   \n"
+               "1:     ll      %1, %3                                  \n"
+               "       bnez    %1, 2f                                  \n"
+               "        lui    %1, 0x8000                              \n"
+               "       sc      %1, %0                                  \n"
+               "       beqzl   %1, 1b                                  \n"
+               "        sync                                           \n"
+               "       li      %2, 1                                   \n"
+               "       .set    reorder                                 \n"
+               "2:                                                     \n"
+               : "=m" (rw->lock), "=&r" (tmp), "=&r" (ret)
+               : "m" (rw->lock)
+               : "memory");
+       } else {
+               __asm__ __volatile__(
+               "       .set    noreorder       # __raw_write_trylock   \n"
+               "       li      %2, 0                                   \n"
+               "1:     ll      %1, %3                                  \n"
+               "       bnez    %1, 2f                                  \n"
+               "       lui     %1, 0x8000                              \n"
+               "       sc      %1, %0                                  \n"
+               "       beqz    %1, 1b                                  \n"
+               "        sync                                           \n"
+               "       li      %2, 1                                   \n"
+               "       .set    reorder                                 \n"
+               "2:                                                     \n"
+               : "=m" (rw->lock), "=&r" (tmp), "=&r" (ret)
+               : "m" (rw->lock)
+               : "memory");
+       }
 
        return ret;
 }