From 1eb1d41a561e761370913f67e5618769d8d81040 Mon Sep 17 00:00:00 2001
From: Michal Meloun <mmel@FreeBSD.org>
Date: Sat, 28 Nov 2015 12:12:28 +0000
Subject: [PATCH] ARM: Implement atomic_swap_int(9). It's used in DRM2 code.

Approved by:	kib (mentor)
---
 sys/arm/include/atomic-v4.h |  7 +++++++
 sys/arm/include/atomic-v6.h | 19 +++++++++++++++++++
 sys/arm/include/atomic.h    |  1 +
 3 files changed, 27 insertions(+)

diff --git a/sys/arm/include/atomic-v4.h b/sys/arm/include/atomic-v4.h
index e8f6fb29f51..0c0b377f154 100644
--- a/sys/arm/include/atomic-v4.h
+++ b/sys/arm/include/atomic-v4.h
@@ -363,6 +363,13 @@ atomic_readandclear_32(volatile u_int32_t *p)
 	return (__swp(0, p));
 }
 
+static __inline uint32_t
+atomic_swap_32(volatile u_int32_t *p, u_int32_t v)
+{
+
+	return (__swp(v, p));
+}
+
 #define atomic_cmpset_rel_32	atomic_cmpset_32
 #define atomic_cmpset_acq_32	atomic_cmpset_32
 #define atomic_set_rel_32	atomic_set_32
diff --git a/sys/arm/include/atomic-v6.h b/sys/arm/include/atomic-v6.h
index aa1780f29ff..06cb5076b9d 100644
--- a/sys/arm/include/atomic-v6.h
+++ b/sys/arm/include/atomic-v6.h
@@ -641,6 +641,25 @@ atomic_testandset_64(volatile uint64_t *p, u_int v)
 	return (atomic_testandset_32(p32, v));
 }
 
+static __inline uint32_t
+atomic_swap_32(volatile uint32_t *p, uint32_t v)
+{
+	uint32_t ret, exflag;
+
+	__asm __volatile(
+	    "1: ldrex	%[ret], [%[ptr]]		\n"
+	    "   strex	%[exf], %[val], [%[ptr]]	\n"
+	    "   teq	%[exf], #0			\n"
+	    "   it	ne				\n"
+	    "   bne	1b				\n"
+	    : [ret] "=r"  (ret),
+	      [exf] "=&r" (exflag)
+	    : [val] "r"  (v),
+	      [ptr] "r"  (p)
+	    : "cc", "memory");
+	return (ret);
+}
+
 #undef ATOMIC_ACQ_REL
 #undef ATOMIC_ACQ_REL_LONG
 
diff --git a/sys/arm/include/atomic.h b/sys/arm/include/atomic.h
index 039af34d77a..ee89f067fd4 100644
--- a/sys/arm/include/atomic.h
+++ b/sys/arm/include/atomic.h
@@ -109,5 +109,6 @@ atomic_store_long(volatile u_long *dst, u_long src)
 #define atomic_readandclear_int		atomic_readandclear_32
 #define atomic_load_acq_int		atomic_load_acq_32
 #define atomic_store_rel_int		atomic_store_rel_32
+#define atomic_swap_int			atomic_swap_32
 
 #endif /* _MACHINE_ATOMIC_H_ */
-- 
2.45.2