From b10fa7b62d4201602dac45290b43defd4a980a12 Mon Sep 17 00:00:00 2001 From: Richard Kuo Date: Mon, 25 Nov 2013 13:49:26 -0600 Subject: [PATCH] Hexagon: fix atomic_set Normal writes in our our architecture don't invalidate lock reservations. Signed-off-by: Richard Kuo --- arch/hexagon/include/asm/atomic.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/arch/hexagon/include/asm/atomic.h b/arch/hexagon/include/asm/atomic.h index 7aae4cb2a29a..17dc63780c06 100644 --- a/arch/hexagon/include/asm/atomic.h +++ b/arch/hexagon/include/asm/atomic.h @@ -26,7 +26,20 @@ #include #define ATOMIC_INIT(i) { (i) } -#define atomic_set(v, i) ((v)->counter = (i)) + +/* Normal writes in our arch don't clear lock reservations */ + +static inline void atomic_set(atomic_t *v, int new) +{ + asm volatile( + "1: r6 = memw_locked(%0);\n" + " memw_locked(%0,p0) = %1;\n" + " if (!P0) jump 1b;\n" + : + : "r" (&v->counter), "r" (new) + : "memory", "p0", "r6" + ); +} /** * atomic_read - reads a word, atomically -- 2.20.1