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

Commit 434b6acc authored by Mark Rutland's avatar Mark Rutland Committed by Ingo Molnar
Browse files

atomics/alpha: Define atomic64_fetch_add_unless() 



As a step towards unifying the atomic/atomic64/atomic_long APIs, this
patch converts the arch/alpha implementation of atomic64_add_unless() into
an implementation of atomic64_fetch_add_unless().

A wrapper in <linux/atomic.h> will build atomic_add_unless() atop of
this, provided it is given a preprocessor definition.

No functional change is intended as a result of this patch.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Reviewed-by: default avatarWill Deacon <will.deacon@arm.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Boqun Feng <boqun.feng@gmail.com>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/lkml/20180621121321.4761-10-mark.rutland@arm.com


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

arch/alpha/include/asm/atomic.h

+12 −11
Original line number Diff line number Diff line
@@ -238,35 +238,36 @@ static __inline__ int atomic_fetch_add_unless(atomic_t *v, int a, int u) 
#define atomic_fetch_add_unless atomic_fetch_add_unless



/**

 * atomic64_add_unless - add unless the number is a given value

 * atomic64_fetch_add_unless - add unless the number is a given value

 * @v: pointer of type atomic64_t

 * @a: the amount to add to v...

 * @u: ...unless v is equal to u.

 *

 * Atomically adds @a to @v, so long as it was not @u.

 * Returns true iff @v was not @u.

 * Returns the old value of @v.

 */

static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)

static __inline__ long atomic64_fetch_add_unless(atomic64_t *v, long a, long u)

{

	long c, tmp;

	long c, new, old;

	smp_mb();

	__asm__ __volatile__(

	"1:	ldq_l	%[tmp],%[mem]\n"

	"	cmpeq	%[tmp],%[u],%[c]\n"

	"	addq	%[tmp],%[a],%[tmp]\n"

	"1:	ldq_l	%[old],%[mem]\n"

	"	cmpeq	%[old],%[u],%[c]\n"

	"	addq	%[old],%[a],%[new]\n"

	"	bne	%[c],2f\n"

	"	stq_c	%[tmp],%[mem]\n"

	"	beq	%[tmp],3f\n"

	"	stq_c	%[new],%[mem]\n"

	"	beq	%[new],3f\n"

	"2:\n"

	".subsection 2\n"

	"3:	br	1b\n"

	".previous"

	: [tmp] "=&r"(tmp), [c] "=&r"(c)

	: [old] "=&r"(old), [new] "=&r"(new), [c] "=&r"(c)

	: [mem] "m"(*v), [a] "rI"(a), [u] "rI"(u)

	: "memory");

	smp_mb();

	return !c;

	return old;

}

#define atomic64_fetch_add_unless atomic64_fetch_add_unless



/*

 * atomic64_dec_if_positive - decrement by 1 if old value positive