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

Commit 5b4a2f0f authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Thomas Gleixner
Browse files

metag: Provide atomic_{or,xor,and} 



Implement atomic logic ops -- atomic_{or,xor,and}.

These will replace the atomic_{set,clear}_mask functions that are
available on some archs.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 74b1bc50

arch/metag/include/asm/atomic_lnkget.h

+10 −28
Original line number Diff line number Diff line
@@ -74,42 +74,24 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \ 
ATOMIC_OPS(add)

ATOMIC_OPS(sub)



#define CONFIG_ARCH_HAS_ATOMIC_OR



ATOMIC_OP(and)

ATOMIC_OP(or)

ATOMIC_OP(xor)



#undef ATOMIC_OPS

#undef ATOMIC_OP_RETURN

#undef ATOMIC_OP



static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)

static inline __deprecated void atomic_clear_mask(unsigned int mask, atomic_t *v)

{

	int temp;



	asm volatile (

		"1:	LNKGETD %0, [%1]\n"

		"	AND	%0, %0, %2\n"

		"	LNKSETD	[%1] %0\n"

		"	DEFR	%0, TXSTAT\n"

		"	ANDT	%0, %0, #HI(0x3f000000)\n"

		"	CMPT	%0, #HI(0x02000000)\n"

		"	BNZ	1b\n"

		: "=&d" (temp)

		: "da" (&v->counter), "bd" (~mask)

		: "cc");

	atomic_and(~mask, v);

}



static inline void atomic_set_mask(unsigned int mask, atomic_t *v)

static inline __deprecated void atomic_set_mask(unsigned int mask, atomic_t *v)

{

	int temp;



	asm volatile (

		"1:	LNKGETD %0, [%1]\n"

		"	OR	%0, %0, %2\n"

		"	LNKSETD	[%1], %0\n"

		"	DEFR	%0, TXSTAT\n"

		"	ANDT	%0, %0, #HI(0x3f000000)\n"

		"	CMPT	%0, #HI(0x02000000)\n"

		"	BNZ	1b\n"

		: "=&d" (temp)

		: "da" (&v->counter), "bd" (mask)

		: "cc");

	atomic_or(mask, v);

}



static inline int atomic_cmpxchg(atomic_t *v, int old, int new)

arch/metag/include/asm/atomic_lock1.h

+7 −14
Original line number Diff line number Diff line
@@ -68,29 +68,22 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \ 


ATOMIC_OPS(add, +=)

ATOMIC_OPS(sub, -=)

ATOMIC_OP(and, &=)

ATOMIC_OP(or, |=)

ATOMIC_OP(xor, ^=)



#undef ATOMIC_OPS

#undef ATOMIC_OP_RETURN

#undef ATOMIC_OP



static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)

static inline __deprecated void atomic_clear_mask(unsigned int mask, atomic_t *v)

{

	unsigned long flags;



	__global_lock1(flags);

	fence();

	v->counter &= ~mask;

	__global_unlock1(flags);

	atomic_and(~mask, v);

}



static inline void atomic_set_mask(unsigned int mask, atomic_t *v)

static inline __deprecated void atomic_set_mask(unsigned int mask, atomic_t *v)

{

	unsigned long flags;



	__global_lock1(flags);

	fence();

	v->counter |= mask;

	__global_unlock1(flags);

	atomic_or(mask, v);

}



static inline int atomic_cmpxchg(atomic_t *v, int old, int new)