Changeset 7328ff4 in mainline for kernel/generic/include/barrier.h

Timestamp:

2018-09-06T18:18:52Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ffa73c6

Parents:

d51cca8

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-08-13 01:29:17)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-09-06 18:18:52)

Message:

Use builtin memory fences for kernel barriers, and convert smp_coherence() into a regular function

File:

• kernel/generic/include/barrier.h (modified) (1 diff)

kernel/generic/include/barrier.h

@@ -30 +30 @@
 #define KERN_COMPILER_BARRIER_H_
 
-#include <arch/barrier.h>
+#include <stdatomic.h>
+#include <stddef.h>
 
-#define compiler_barrier() asm volatile ("" ::: "memory")
+static inline void compiler_barrier(void)
+{
+        atomic_signal_fence(memory_order_seq_cst);
+}
+
+static inline void memory_barrier(void)
+{
+        atomic_thread_fence(memory_order_seq_cst);
+}
+
+static inline void read_barrier(void)
+{
+        atomic_thread_fence(memory_order_acquire);
+}
+
+static inline void write_barrier(void)
+{
+        atomic_thread_fence(memory_order_release);
+}
+
+#define CS_ENTER_BARRIER() atomic_thread_fence(memory_order_acquire)
+#define CS_LEAVE_BARRIER() atomic_thread_fence(memory_order_release)
 
 /** Forces the compiler to access (ie load/store) the variable only once. */
 #define ACCESS_ONCE(var) (*((volatile typeof(var)*)&(var)))
 
+extern void smc_coherence(void *, size_t);
+
 #endif /* KERN_COMPILER_BARRIER_H_ */