Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93ea02bb authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

arch: Clean up asm/barrier.h implementations using asm-generic/barrier.h 



We're going to be adding a few new barrier primitives, and in order to
avoid endless duplication make more agressive use of
asm-generic/barrier.h.

Change the asm-generic/barrier.h such that it allows partial barrier
definitions and fills out the rest with defaults.

There are a few architectures (m32r, m68k) that could probably
do away with their barrier.h file entirely but are kept for now due to
their unconventional nop() implementation.

Suggested-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: default avatar"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Reviewed-by: default avatarMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: Michael Ellerman <michael@ellerman.id.au>
Cc: Michael Neuling <mikey@neuling.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Victor Kaplansky <VICTORK@il.ibm.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/20131213150640.846368594@infradead.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 1de7da37

arch/alpha/include/asm/barrier.h

+5 −20
Original line number Diff line number Diff line
@@ -3,33 +3,18 @@ 


#include <asm/compiler.h>



#define mb() \

__asm__ __volatile__("mb": : :"memory")

#define mb()	__asm__ __volatile__("mb": : :"memory")

#define rmb()	__asm__ __volatile__("mb": : :"memory")

#define wmb()	__asm__ __volatile__("wmb": : :"memory")



#define rmb() \

__asm__ __volatile__("mb": : :"memory")



#define wmb() \

__asm__ __volatile__("wmb": : :"memory")



#define read_barrier_depends() \

__asm__ __volatile__("mb": : :"memory")

#define read_barrier_depends() __asm__ __volatile__("mb": : :"memory")



#ifdef CONFIG_SMP

#define __ASM_SMP_MB	"\tmb\n"

#define smp_mb()	mb()

#define smp_rmb()	rmb()

#define smp_wmb()	wmb()

#define smp_read_barrier_depends()	read_barrier_depends()

#else

#define __ASM_SMP_MB

#define smp_mb()	barrier()

#define smp_rmb()	barrier()

#define smp_wmb()	barrier()

#define smp_read_barrier_depends()	do { } while (0)

#endif



#define set_mb(var, value) \

do { var = value; mb(); } while (0)

#include <asm-generic/barrier.h>



#endif		/* __BARRIER_H */

arch/arc/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -47,3 +47,4 @@ generic-y += user.h 
generic-y += vga.h

generic-y += xor.h

generic-y += preempt.h

generic-y += barrier.h

arch/avr32/include/asm/barrier.h

+5 −12
Original line number Diff line number Diff line
@@ -8,22 +8,15 @@ 
#ifndef __ASM_AVR32_BARRIER_H

#define __ASM_AVR32_BARRIER_H



#define nop()			asm volatile("nop")



#define mb()			asm volatile("" : : : "memory")

#define rmb()			mb()

/*

 * Weirdest thing ever.. no full barrier, but it has a write barrier!

 */

#define wmb()	asm volatile("sync 0" : : : "memory")

#define read_barrier_depends()  do { } while(0)

#define set_mb(var, value)      do { var = value; mb(); } while(0)



#ifdef CONFIG_SMP

# error "The AVR32 port does not support SMP"

#else

# define smp_mb()		barrier()

# define smp_rmb()		barrier()

# define smp_wmb()		barrier()

# define smp_read_barrier_depends() do { } while(0)

#endif



#include <asm-generic/barrier.h>



#endif /* __ASM_AVR32_BARRIER_H */

arch/blackfin/include/asm/barrier.h

+1 −17
Original line number Diff line number Diff line
@@ -23,26 +23,10 @@ 
# define rmb()	do { barrier(); smp_check_barrier(); } while (0)

# define wmb()	do { barrier(); smp_mark_barrier(); } while (0)

# define read_barrier_depends()	do { barrier(); smp_check_barrier(); } while (0)

#else

# define mb()	barrier()

# define rmb()	barrier()

# define wmb()	barrier()

# define read_barrier_depends()	do { } while (0)

#endif



#else /* !CONFIG_SMP */



#define mb()	barrier()

#define rmb()	barrier()

#define wmb()	barrier()

#define read_barrier_depends()	do { } while (0)



#endif /* !CONFIG_SMP */



#define smp_mb()  mb()

#define smp_rmb() rmb()

#define smp_wmb() wmb()

#define set_mb(var, value) do { var = value; mb(); } while (0)

#define smp_read_barrier_depends()	read_barrier_depends()

#include <asm-generic/barrier.h>



#endif /* _BLACKFIN_BARRIER_H */

arch/cris/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -12,3 +12,4 @@ generic-y += trace_clock.h 
generic-y += vga.h

generic-y += xor.h

generic-y += preempt.h

generic-y += barrier.h