locking/spinlock, arch: Update and fix spin_unlock_wait() implementations

[cascardo/linux.git] / arch / mips / include / asm / spinlock.h

diff --git a/arch/mips/include/asm/spinlock.h b/arch/mips/include/asm/spinlock.h
index 40196be..f485afe 100644 (file)
--- a/arch/mips/include/asm/spinlock.h
+++ b/arch/mips/include/asm/spinlock.h
@@ -12,6 +12,7 @@
 #include <linux/compiler.h>
 
 #include <asm/barrier.h>
+#include <asm/processor.h>
 #include <asm/compiler.h>
 #include <asm/war.h>
 
@@ -48,8 +49,22 @@ static inline int arch_spin_value_unlocked(arch_spinlock_t lock)
 }
 
 #define arch_spin_lock_flags(lock, flags) arch_spin_lock(lock)
-#define arch_spin_unlock_wait(x) \
-       while (arch_spin_is_locked(x)) { cpu_relax(); }
+
+static inline void arch_spin_unlock_wait(arch_spinlock_t *lock)
+{
+       u16 owner = READ_ONCE(lock->h.serving_now);
+       smp_rmb();
+       for (;;) {
+               arch_spinlock_t tmp = READ_ONCE(*lock);
+
+               if (tmp.h.serving_now == tmp.h.ticket ||
+                   tmp.h.serving_now != owner)
+                       break;
+
+               cpu_relax();
+       }
+       smp_acquire__after_ctrl_dep();
+}
 
 static inline int arch_spin_is_contended(arch_spinlock_t *lock)
 {