Merge tag 'for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power...

[sfrench/cifs-2.6.git] / arch / hexagon / include / asm / atomic.h

diff --git a/arch/hexagon/include/asm/atomic.h b/arch/hexagon/include/asm/atomic.h
index 55696c4100d468208c757f30be47806c877dfab9..a62ba368b27d1ddf6f750efd1dcaa2b51419d1d8 100644 (file)
--- a/arch/hexagon/include/asm/atomic.h
+++ b/arch/hexagon/include/asm/atomic.h
@@ -110,7 +110,7 @@ static inline void atomic_##op(int i, atomic_t *v)                  \
        );                                                              \
 }                                                                      \
 
-#define ATOMIC_OP_RETURN(op)                                                   \
+#define ATOMIC_OP_RETURN(op)                                           \
 static inline int atomic_##op##_return(int i, atomic_t *v)             \
 {                                                                      \
        int output;                                                     \
@@ -127,16 +127,37 @@ static inline int atomic_##op##_return(int i, atomic_t *v)                \
        return output;                                                  \
 }
 
-#define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
+#define ATOMIC_FETCH_OP(op)                                            \
+static inline int atomic_fetch_##op(int i, atomic_t *v)                        \
+{                                                                      \
+       int output, val;                                                \
+                                                                       \
+       __asm__ __volatile__ (                                          \
+               "1:     %0 = memw_locked(%2);\n"                        \
+               "       %1 = "#op "(%0,%3);\n"                          \
+               "       memw_locked(%2,P3)=%1;\n"                       \
+               "       if !P3 jump 1b;\n"                              \
+               : "=&r" (output), "=&r" (val)                           \
+               : "r" (&v->counter), "r" (i)                            \
+               : "memory", "p3"                                        \
+       );                                                              \
+       return output;                                                  \
+}
+
+#define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op) ATOMIC_FETCH_OP(op)
 
 ATOMIC_OPS(add)
 ATOMIC_OPS(sub)
 
-ATOMIC_OP(and)
-ATOMIC_OP(or)
-ATOMIC_OP(xor)
+#undef ATOMIC_OPS
+#define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_FETCH_OP(op)
+
+ATOMIC_OPS(and)
+ATOMIC_OPS(or)
+ATOMIC_OPS(xor)
 
 #undef ATOMIC_OPS
+#undef ATOMIC_FETCH_OP
 #undef ATOMIC_OP_RETURN
 #undef ATOMIC_OP