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

Commit e9cf9046 authored by Will Deacon's avatar Will Deacon Committed by Ian Maund
Browse files

arm64: asm: remove redundant "cc" clobbers 



cbnz/tbnz don't update the condition flags, so remove the "cc" clobbers
from inline asm blocks that only use these instructions to implement
conditional branches.

Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Git-commit: 95c4189689f92fba7ecf9097173404d4928c6e9b
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Signed-off-by: default avatarIan Maund <imaund@codeaurora.org>
parent cbe85370

arch/arm64/include/asm/atomic.h

+10 −14
Original line number Diff line number Diff line
@@ -54,8 +54,7 @@ static inline void atomic_add(int i, atomic_t *v) 
"	stxr	%w1, %w0, %2\n"

"	cbnz	%w1, 1b"

	: "=&r" (result), "=&r" (tmp), "+Q" (v->counter)

	: "Ir" (i)

	: "cc");

	: "Ir" (i));

}



static inline int atomic_add_return(int i, atomic_t *v)
@@ -70,7 +69,7 @@ static inline int atomic_add_return(int i, atomic_t *v) 
"	cbnz	%w1, 1b"

	: "=&r" (result), "=&r" (tmp), "+Q" (v->counter)

	: "Ir" (i)

	: "cc", "memory");

	: "memory");



	smp_mb();

	return result;
@@ -87,8 +86,7 @@ static inline void atomic_sub(int i, atomic_t *v) 
"	stxr	%w1, %w0, %2\n"

"	cbnz	%w1, 1b"

	: "=&r" (result), "=&r" (tmp), "+Q" (v->counter)

	: "Ir" (i)

	: "cc");

	: "Ir" (i));

}



static inline int atomic_sub_return(int i, atomic_t *v)
@@ -103,7 +101,7 @@ static inline int atomic_sub_return(int i, atomic_t *v) 
"	cbnz	%w1, 1b"

	: "=&r" (result), "=&r" (tmp), "+Q" (v->counter)

	: "Ir" (i)

	: "cc", "memory");

	: "memory");



	smp_mb();

	return result;
@@ -125,7 +123,7 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new) 
"2:"

	: "=&r" (tmp), "=&r" (oldval), "+Q" (ptr->counter)

	: "Ir" (old), "r" (new)

	: "cc", "memory");

	: "cc");



	smp_mb();

	return oldval;
@@ -178,8 +176,7 @@ static inline void atomic64_add(u64 i, atomic64_t *v) 
"	stxr	%w1, %0, %2\n"

"	cbnz	%w1, 1b"

	: "=&r" (result), "=&r" (tmp), "+Q" (v->counter)

	: "Ir" (i)

	: "cc");

	: "Ir" (i));

}



static inline long atomic64_add_return(long i, atomic64_t *v)
@@ -194,7 +191,7 @@ static inline long atomic64_add_return(long i, atomic64_t *v) 
"	cbnz	%w1, 1b"

	: "=&r" (result), "=&r" (tmp), "+Q" (v->counter)

	: "Ir" (i)

	: "cc", "memory");

	: "memory");



	smp_mb();

	return result;
@@ -211,8 +208,7 @@ static inline void atomic64_sub(u64 i, atomic64_t *v) 
"	stxr	%w1, %0, %2\n"

"	cbnz	%w1, 1b"

	: "=&r" (result), "=&r" (tmp), "+Q" (v->counter)

	: "Ir" (i)

	: "cc");

	: "Ir" (i));

}



static inline long atomic64_sub_return(long i, atomic64_t *v)
@@ -227,7 +223,7 @@ static inline long atomic64_sub_return(long i, atomic64_t *v) 
"	cbnz	%w1, 1b"

	: "=&r" (result), "=&r" (tmp), "+Q" (v->counter)

	: "Ir" (i)

	: "cc", "memory");

	: "memory");



	smp_mb();

	return result;
@@ -249,7 +245,7 @@ static inline long atomic64_cmpxchg(atomic64_t *ptr, long old, long new) 
"2:"

	: "=&r" (res), "=&r" (oldval), "+Q" (ptr->counter)

	: "Ir" (old), "r" (new)

	: "cc", "memory");

	: "cc");



	smp_mb();

	return oldval;

arch/arm64/include/asm/cmpxchg.h

+4 −4
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size 
		"	cbnz	%w1, 1b\n"

			: "=&r" (ret), "=&r" (tmp), "+Q" (*(u8 *)ptr)

			: "r" (x)

			: "cc", "memory");

			: "memory");

		break;

	case 2:

		asm volatile("//	__xchg2\n"
@@ -43,7 +43,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size 
		"	cbnz	%w1, 1b\n"

			: "=&r" (ret), "=&r" (tmp), "+Q" (*(u16 *)ptr)

			: "r" (x)

			: "cc", "memory");

			: "memory");

		break;

	case 4:

		asm volatile("//	__xchg4\n"
@@ -52,7 +52,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size 
		"	cbnz	%w1, 1b\n"

			: "=&r" (ret), "=&r" (tmp), "+Q" (*(u32 *)ptr)

			: "r" (x)

			: "cc", "memory");

			: "memory");

		break;

	case 8:

		asm volatile("//	__xchg8\n"
@@ -61,7 +61,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size 
		"	cbnz	%w1, 1b\n"

			: "=&r" (ret), "=&r" (tmp), "+Q" (*(u64 *)ptr)

			: "r" (x)

			: "cc", "memory");

			: "memory");

		break;

	default:

		BUILD_BUG();

arch/arm64/include/asm/futex.h

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
"	.popsection\n"							\

	: "=&r" (ret), "=&r" (oldval), "+Q" (*uaddr), "=&r" (tmp)	\

	: "r" (oparg), "Ir" (-EFAULT)					\

	: "cc", "memory")

	: "memory")



static inline int

futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
@@ -129,7 +129,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, 
"	.popsection\n"

	: "+r" (ret), "=&r" (val), "+Q" (*uaddr), "=&r" (tmp)

	: "r" (oldval), "r" (newval), "Ir" (-EFAULT)

	: "cc", "memory");

	: "memory");



	*uval = val;

	return ret;

arch/arm64/include/asm/spinlock.h

+5 −5
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static inline void arch_write_lock(arch_rwlock_t *rw) 
	"	cbnz	%w0, 2b\n"

	: "=&r" (tmp), "+Q" (rw->lock)

	: "r" (0x80000000)

	: "cc", "memory");

	: "memory");

}



static inline int arch_write_trylock(arch_rwlock_t *rw)
@@ -146,7 +146,7 @@ static inline int arch_write_trylock(arch_rwlock_t *rw) 
	"1:\n"

	: "=&r" (tmp), "+Q" (rw->lock)

	: "r" (0x80000000)

	: "cc", "memory");

	: "memory");



	return !tmp;

}
@@ -187,7 +187,7 @@ static inline void arch_read_lock(arch_rwlock_t *rw) 
	"	cbnz	%w1, 2b\n"

	: "=&r" (tmp), "=&r" (tmp2), "+Q" (rw->lock)

	:

	: "cc", "memory");

	: "memory");

}



static inline void arch_read_unlock(arch_rwlock_t *rw)
@@ -201,7 +201,7 @@ static inline void arch_read_unlock(arch_rwlock_t *rw) 
	"	cbnz	%w1, 1b\n"

	: "=&r" (tmp), "=&r" (tmp2), "+Q" (rw->lock)

	:

	: "cc", "memory");

	: "memory");

}



static inline int arch_read_trylock(arch_rwlock_t *rw)
@@ -216,7 +216,7 @@ static inline int arch_read_trylock(arch_rwlock_t *rw) 
	"1:\n"

	: "=&r" (tmp), "+r" (tmp2), "+Q" (rw->lock)

	:

	: "cc", "memory");

	: "memory");



	return !tmp2;

}