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

Commit d85ebff0 authored by James Hogan's avatar James Hogan Committed by Paolo Bonzini
Browse files

MIPS: KVM: Fix pre-r6 ll/sc instructions on r6 



The atomic KVM register access macros in kvm_host.h (for the guest Cause
register with KVM in trap & emulate mode) use ll/sc instructions,
however they still .set mips3, which causes pre-MIPSr6 instruction
encodings to be emitted, even for a MIPSr6 build.

Fix it to use MIPS_ISA_ARCH_LEVEL as other parts of arch/mips already
do.

Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim KrÄmář <rkrcmar@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d14740fe

arch/mips/include/asm/kvm_host.h

+3 −3
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ static inline void _kvm_atomic_set_c0_guest_reg(unsigned long *reg, 
	unsigned long temp;

	do {

		__asm__ __volatile__(

		"	.set	mips3				\n"

		"	.set	"MIPS_ISA_ARCH_LEVEL"		\n"

		"	" __LL "%0, %1				\n"

		"	or	%0, %2				\n"

		"	" __SC	"%0, %1				\n"
@@ -416,7 +416,7 @@ static inline void _kvm_atomic_clear_c0_guest_reg(unsigned long *reg, 
	unsigned long temp;

	do {

		__asm__ __volatile__(

		"	.set	mips3				\n"

		"	.set	"MIPS_ISA_ARCH_LEVEL"		\n"

		"	" __LL "%0, %1				\n"

		"	and	%0, %2				\n"

		"	" __SC	"%0, %1				\n"
@@ -433,7 +433,7 @@ static inline void _kvm_atomic_change_c0_guest_reg(unsigned long *reg, 
	unsigned long temp;

	do {

		__asm__ __volatile__(

		"	.set	mips3				\n"

		"	.set	"MIPS_ISA_ARCH_LEVEL"		\n"

		"	" __LL "%0, %1				\n"

		"	and	%0, %2				\n"

		"	or	%0, %3				\n"