Commit 770345ad authored by Mark Rutland's avatar Mark Rutland Committed by Peter Zijlstra
Browse files

locking/atomic: sh: add preprocessor symbols 



Some atomics can be implemented in several different ways, e.g.
FULL/ACQUIRE/RELEASE ordered atomics can be implemented in terms of
RELAXED atomics, and ACQUIRE/RELEASE/RELAXED can be implemented in terms
of FULL ordered atomics. Other atomics are optional, and don't exist in
some configurations (e.g. not all architectures implement the 128-bit
cmpxchg ops).

Subsequent patches will require that architectures define a preprocessor
symbol for any atomic (or ordering variant) which is optional. This will
make the fallback ifdeffery more robust, and simplify future changes.

Add the required definitions to arch/sh.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20230605070124.3741859-11-mark.rutland@arm.com
parent 07bf3dcb

arch/sh/include/asm/atomic-grb.h

+9 −0
Original line number Diff line number Diff line
@@ -71,6 +71,11 @@ static inline int arch_atomic_fetch_##op(int i, atomic_t *v) \ 
ATOMIC_OPS(add)

ATOMIC_OPS(sub)



#define arch_atomic_add_return	arch_atomic_add_return

#define arch_atomic_sub_return	arch_atomic_sub_return

#define arch_atomic_fetch_add	arch_atomic_fetch_add

#define arch_atomic_fetch_sub	arch_atomic_fetch_sub



#undef ATOMIC_OPS

#define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_FETCH_OP(op)
@@ -78,6 +83,10 @@ ATOMIC_OPS(and) 
ATOMIC_OPS(or)

ATOMIC_OPS(xor)



#define arch_atomic_fetch_and	arch_atomic_fetch_and

#define arch_atomic_fetch_or	arch_atomic_fetch_or

#define arch_atomic_fetch_xor	arch_atomic_fetch_xor



#undef ATOMIC_OPS

#undef ATOMIC_FETCH_OP

#undef ATOMIC_OP_RETURN

arch/sh/include/asm/atomic-irq.h

+9 −0
Original line number Diff line number Diff line
@@ -55,6 +55,11 @@ static inline int arch_atomic_fetch_##op(int i, atomic_t *v) \ 
ATOMIC_OPS(add, +=)

ATOMIC_OPS(sub, -=)



#define arch_atomic_add_return	arch_atomic_add_return

#define arch_atomic_sub_return	arch_atomic_sub_return

#define arch_atomic_fetch_add	arch_atomic_fetch_add

#define arch_atomic_fetch_sub	arch_atomic_fetch_sub



#undef ATOMIC_OPS

#define ATOMIC_OPS(op, c_op)						\

	ATOMIC_OP(op, c_op)						\
@@ -64,6 +69,10 @@ ATOMIC_OPS(and, &=) 
ATOMIC_OPS(or, |=)

ATOMIC_OPS(xor, ^=)



#define arch_atomic_fetch_and	arch_atomic_fetch_and

#define arch_atomic_fetch_or	arch_atomic_fetch_or

#define arch_atomic_fetch_xor	arch_atomic_fetch_xor



#undef ATOMIC_OPS

#undef ATOMIC_FETCH_OP

#undef ATOMIC_OP_RETURN

arch/sh/include/asm/atomic-llsc.h

+9 −0
Original line number Diff line number Diff line
@@ -73,6 +73,11 @@ static inline int arch_atomic_fetch_##op(int i, atomic_t *v) \ 
ATOMIC_OPS(add)

ATOMIC_OPS(sub)



#define arch_atomic_add_return	arch_atomic_add_return

#define arch_atomic_sub_return	arch_atomic_sub_return

#define arch_atomic_fetch_add	arch_atomic_fetch_add

#define arch_atomic_fetch_sub	arch_atomic_fetch_sub



#undef ATOMIC_OPS

#define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_FETCH_OP(op)
@@ -80,6 +85,10 @@ ATOMIC_OPS(and) 
ATOMIC_OPS(or)

ATOMIC_OPS(xor)



#define arch_atomic_fetch_and	arch_atomic_fetch_and

#define arch_atomic_fetch_or	arch_atomic_fetch_or

#define arch_atomic_fetch_xor	arch_atomic_fetch_xor



#undef ATOMIC_OPS

#undef ATOMIC_FETCH_OP

#undef ATOMIC_OP_RETURN