Commit d8911a28 authored by Bibo Mao's avatar Bibo Mao Committed by Hongchen Zhang
Browse files

LoongArch: refresh usage of sync 

LoongArch inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I6BWFP



--------------------------------

sync is used for ll/sc pair for read barrier, instead only ll is
required for read barrier, sc does not need. This patch fixes
the issue.

Change-Id: Ib8a42f50d494e3e80cda0843d069668604b486e6
Signed-off-by: default avatarBibo Mao <maobibo@loongson.cn>
parent 0dde507c

arch/loongarch/include/asm/atomic.h

+8 −0
Original line number Diff line number Diff line
@@ -162,8 +162,10 @@ static inline int arch_atomic_sub_if_positive(int i, atomic_t *v) 
		"	bltz	%0, 2f					\n"

		"	sc.w	%1, %2					\n"

		"	beqz	%1, 1b					\n"

		"	b	3f					\n"

		"2:							\n"

		__WEAK_LLSC_MB

		"3:							\n"

		: "=&r" (result), "=&r" (temp), "+ZC" (v->counter)

		: "I" (-i));

	} else {
@@ -174,8 +176,10 @@ static inline int arch_atomic_sub_if_positive(int i, atomic_t *v) 
		"	bltz	%0, 2f					\n"

		"	sc.w	%1, %2					\n"

		"	beqz	%1, 1b					\n"

		"	b	3f					\n"

		"2:							\n"

		__WEAK_LLSC_MB

		"3:							\n"

		: "=&r" (result), "=&r" (temp), "+ZC" (v->counter)

		: "r" (i));

	}
@@ -323,8 +327,10 @@ static inline long arch_atomic64_sub_if_positive(long i, atomic64_t *v) 
		"	bltz	%0, 2f					\n"

		"	sc.d	%1, %2					\n"

		"	beqz	%1, 1b					\n"

		"	b	3f					\n"

		"2:							\n"

		__WEAK_LLSC_MB

		"3:							\n"

		: "=&r" (result), "=&r" (temp), "+ZC" (v->counter)

		: "I" (-i));

	} else {
@@ -335,8 +341,10 @@ static inline long arch_atomic64_sub_if_positive(long i, atomic64_t *v) 
		"	bltz	%0, 2f					\n"

		"	sc.d	%1, %2					\n"

		"	beqz	%1, 1b					\n"

		"	b	3f					\n"

		"2:							\n"

		__WEAK_LLSC_MB

		"3:							\n"

		: "=&r" (result), "=&r" (temp), "+ZC" (v->counter)

		: "r" (i));

	}

arch/loongarch/include/asm/cmpxchg.h

+2 −0
Original line number Diff line number Diff line
@@ -102,8 +102,10 @@ static inline unsigned long __xchg(volatile void *ptr, unsigned long x, 
	"	move	$t0, %z4			\n"		\

	"	" st "	$t0, %1				\n"		\

	"	beqz	$t0, 1b				\n"		\

	"	b	3f				\n"		\

	"2:						\n"		\

	__WEAK_LLSC_MB							\

	"3:						\n"		\

	: "=&r" (__ret), "=ZB"(*m)					\

	: "ZB"(*m), "Jr" (old), "Jr" (new)				\

	: "t0", "memory");						\

arch/loongarch/include/asm/futex.h

+2 −0
Original line number Diff line number Diff line
@@ -84,8 +84,10 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, u32 oldval, u32 newv 
	"	move	$t0, %z5				\n"

	"2:	sc.w	$t0, %2					\n"

	"	beqz	$t0, 1b					\n"

	"	b	5f					\n"

	"3:							\n"

	__WEAK_LLSC_MB

	"5:							\n"

	"	.section .fixup,\"ax\"				\n"

	"4:	li.d	%0, %6					\n"

	"	b	3b					\n"

arch/loongarch/include/asm/pgtable.h

+2 −1
Original line number Diff line number Diff line
@@ -298,9 +298,10 @@ static inline void set_pte(pte_t *ptep, pte_t pteval) 
		"	 or	%[tmp], %[tmp], %[global]	\n"

			__SC	"%[tmp], %[buddy]		\n"

		"	beqz	%[tmp], 1b			\n"

		"	nop					\n"

		"	b	3f				\n"

		"2:						\n"

		__WEAK_LLSC_MB

		"3:						\n"

		: [buddy] "+m" (buddy->pte), [tmp] "=&r" (tmp)

		: [global] "r" (page_global));

#else /* !CONFIG_SMP */