Commit ff57698a authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: Fix update form addressing in inline assembly 



In several places, inline assembly uses the "%Un" modifier
to enable the use of instruction with update form addressing,
but the associated "<>" constraint is missing.

As mentioned in previous patch, this fails with gcc 4.9, so
"<>" can't be used directly.

Use UPD_CONSTR macro everywhere %Un modifier is used.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: default avatarSegher Boessenkool <segher@kernel.crashing.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/62eab5ca595485c192de1765bdac099f633a21d0.1603358942.git.christophe.leroy@csgroup.eu
parent d85be8a4

arch/powerpc/include/asm/atomic.h

+5 −4
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/types.h>

#include <asm/cmpxchg.h>

#include <asm/barrier.h>

#include <asm/asm-const.h>



/*

 * Since *_return_relaxed and {cmp}xchg_relaxed are implemented with
@@ -26,14 +27,14 @@ static __inline__ int atomic_read(const atomic_t *v) 
{

	int t;



	__asm__ __volatile__("lwz%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));

	__asm__ __volatile__("lwz%U1%X1 %0,%1" : "=r"(t) : "m"UPD_CONSTR(v->counter));



	return t;

}



static __inline__ void atomic_set(atomic_t *v, int i)

{

	__asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));

	__asm__ __volatile__("stw%U0%X0 %1,%0" : "=m"UPD_CONSTR(v->counter) : "r"(i));

}



#define ATOMIC_OP(op, asm_op)						\
@@ -316,14 +317,14 @@ static __inline__ s64 atomic64_read(const atomic64_t *v) 
{

	s64 t;



	__asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m"(v->counter));

	__asm__ __volatile__("ld%U1%X1 %0,%1" : "=r"(t) : "m"UPD_CONSTR(v->counter));



	return t;

}



static __inline__ void atomic64_set(atomic64_t *v, s64 i)

{

	__asm__ __volatile__("std%U0%X0 %1,%0" : "=m"(v->counter) : "r"(i));

	__asm__ __volatile__("std%U0%X0 %1,%0" : "=m"UPD_CONSTR(v->counter) : "r"(i));

}



#define ATOMIC64_OP(op, asm_op)						\

arch/powerpc/include/asm/io.h

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static inline u##size name(const volatile u##size __iomem *addr) \ 
{									\

	u##size ret;							\

	__asm__ __volatile__("sync;"#insn"%U1%X1 %0,%1;twi 0,%0,0;isync"\

		: "=r" (ret) : "m" (*addr) : "memory");			\

		: "=r" (ret) : "m"UPD_CONSTR (*addr) : "memory");	\

	return ret;							\

}
@@ -130,7 +130,7 @@ static inline u##size name(const volatile u##size __iomem *addr) \ 
static inline void name(volatile u##size __iomem *addr, u##size val)	\

{									\

	__asm__ __volatile__("sync;"#insn"%U0%X0 %1,%0"			\

		: "=m" (*addr) : "r" (val) : "memory");			\

		: "=m"UPD_CONSTR (*addr) : "r" (val) : "memory");	\

	mmiowb_set_pending();						\

}

arch/powerpc/kvm/powerpc.c

+2 −2
Original line number Diff line number Diff line
@@ -1087,7 +1087,7 @@ static inline u64 sp_to_dp(u32 fprs) 


	preempt_disable();

	enable_kernel_fp();

	asm ("lfs%U1%X1 0,%1; stfd%U0%X0 0,%0" : "=m" (fprd) : "m" (fprs)

	asm ("lfs%U1%X1 0,%1; stfd%U0%X0 0,%0" : "=m"UPD_CONSTR (fprd) : "m"UPD_CONSTR (fprs)

	     : "fr0");

	preempt_enable();

	return fprd;
@@ -1099,7 +1099,7 @@ static inline u32 dp_to_sp(u64 fprd) 


	preempt_disable();

	enable_kernel_fp();

	asm ("lfd%U1%X1 0,%1; stfs%U0%X0 0,%0" : "=m" (fprs) : "m" (fprd)

	asm ("lfd%U1%X1 0,%1; stfs%U0%X0 0,%0" : "=m"UPD_CONSTR (fprs) : "m"UPD_CONSTR (fprd)

	     : "fr0");

	preempt_enable();

	return fprs;