From: Richard Kuo <rkuo@codeaurora.org>
Date: Mon, 25 Nov 2013 19:49:26 +0000 (-0600)
Subject: Hexagon: fix atomic_set
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b10fa7b62d4201602dac45290b43defd4a980a12;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Hexagon: fix atomic_set

Normal writes in our our architecture don't invalidate lock
reservations.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
---

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 <asm/cmpxchg.h>
 
 #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