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

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

arch,tile: Convert smp_mb__*() 



Implement the new smp_mb__* ops as per the old ones.

Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Acked-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: default avatarChris Metcalf <cmetcalf@tilera.com>
Link: http://lkml.kernel.org/n/tip-euuabnf5a3u23fy4fq8m3jcg@git.kernel.org


Cc: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Chen Gang <gang.chen@asianux.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 56d36489

arch/tile/include/asm/atomic_32.h

+0 −10
Original line number Diff line number Diff line
@@ -169,16 +169,6 @@ static inline void atomic64_set(atomic64_t *v, long long n) 
#define atomic64_dec_and_test(v)	(atomic64_dec_return((v)) == 0)

#define atomic64_inc_not_zero(v)	atomic64_add_unless((v), 1LL, 0LL)



/*

 * We need to barrier before modifying the word, since the _atomic_xxx()

 * routines just tns the lock and then read/modify/write of the word.

 * But after the word is updated, the routine issues an "mf" before returning,

 * and since it's a function call, we don't even need a compiler barrier.

 */

#define smp_mb__before_atomic_dec()	smp_mb()

#define smp_mb__before_atomic_inc()	smp_mb()

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

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



#endif /* !__ASSEMBLY__ */

arch/tile/include/asm/atomic_64.h

+0 −6
Original line number Diff line number Diff line
@@ -105,12 +105,6 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u) 


#define atomic64_inc_not_zero(v)	atomic64_add_unless((v), 1, 0)



/* Atomic dec and inc don't implement barrier, so provide them if needed. */

#define smp_mb__before_atomic_dec()	smp_mb()

#define smp_mb__after_atomic_dec()	smp_mb()

#define smp_mb__before_atomic_inc()	smp_mb()

#define smp_mb__after_atomic_inc()	smp_mb()



/* Define this to indicate that cmpxchg is an efficient operation. */

#define __HAVE_ARCH_CMPXCHG

arch/tile/include/asm/barrier.h

+14 −0
Original line number Diff line number Diff line
@@ -72,6 +72,20 @@ mb_incoherent(void) 
#define mb()		fast_mb()

#define iob()		fast_iob()



#ifndef __tilegx__ /* 32 bit */

/*

 * We need to barrier before modifying the word, since the _atomic_xxx()

 * routines just tns the lock and then read/modify/write of the word.

 * But after the word is updated, the routine issues an "mf" before returning,

 * and since it's a function call, we don't even need a compiler barrier.

 */

#define smp_mb__before_atomic()	smp_mb()

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

#else /* 64 bit */

#define smp_mb__before_atomic()	smp_mb()

#define smp_mb__after_atomic()	smp_mb()

#endif



#include <asm-generic/barrier.h>



#endif /* !__ASSEMBLY__ */

arch/tile/include/asm/bitops.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#define _ASM_TILE_BITOPS_H



#include <linux/types.h>

#include <asm/barrier.h>



#ifndef _LINUX_BITOPS_H

#error only <linux/bitops.h> can be included directly

arch/tile/include/asm/bitops_32.h

+2 −6
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ static inline void set_bit(unsigned nr, volatile unsigned long *addr) 
 * restricted to acting on a single-word quantity.

 *

 * clear_bit() may not contain a memory barrier, so if it is used for

 * locking purposes, you should call smp_mb__before_clear_bit() and/or

 * smp_mb__after_clear_bit() to ensure changes are visible on other cpus.

 * locking purposes, you should call smp_mb__before_atomic() and/or

 * smp_mb__after_atomic() to ensure changes are visible on other cpus.

 */

static inline void clear_bit(unsigned nr, volatile unsigned long *addr)

{
@@ -121,10 +121,6 @@ static inline int test_and_change_bit(unsigned nr, 
	return (_atomic_xor(addr, mask) & mask) != 0;

}



/* See discussion at smp_mb__before_atomic_dec() in <asm/atomic_32.h>. */

#define smp_mb__before_clear_bit()	smp_mb()

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



#include <asm-generic/bitops/ext2-atomic.h>



#endif /* _ASM_TILE_BITOPS_32_H */