Changeset 7328ff4 in mainline for kernel/arch/ia64/include

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

Location:

kernel/arch/ia64/include/arch

Files:

• barrier.h (modified) (2 diffs)
• cpu.h (modified) (1 diff)

kernel/arch/ia64/include/arch/barrier.h

@@ -36 +36 @@
 #define KERN_ia64_BARRIER_H_
 
-/*
- * TODO: Implement true IA-64 memory barriers for macros below.
- */
-#define CS_ENTER_BARRIER()      memory_barrier()
-#define CS_LEAVE_BARRIER()      memory_barrier()
-
-#define memory_barrier()        asm volatile ("mf\n" ::: "memory")
-#define read_barrier()          memory_barrier()
-#define write_barrier()         memory_barrier()
+#define mf()    asm volatile ("mf\n" ::: "memory")
 
 #define srlz_i()                \
@@ -56 +48 @@
         asm volatile (";; sync.i\n" ::: "memory")
 
-#ifdef KERNEL
-
-#define FC_INVAL_MIN            32
-#define smc_coherence(a, l)             \
-{                                               \
-        unsigned long i;                        \
-        for (i = 0; i < (l); i += FC_INVAL_MIN) \
-                fc_i((void *)(a) + i);          \
-        sync_i();                               \
-        srlz_i();                               \
-}
-
-#endif  /* KERNEL */
-
 #endif
 

kernel/arch/ia64/include/arch/cpu.h

@@ -38 +38 @@
 #include <arch/register.h>
 #include <arch/asm.h>
+#include <arch/barrier.h>
 #include <arch/bootinfo.h>
 #include <stdint.h>