Commit 1d756942 authored by James Hogan's avatar James Hogan Committed by Paolo Bonzini

MIPS: KVM: Set CP0_Status.KX on MIPS64

Update the KVM entry code to set the CP0_Entry.KX bit on 64-bit kernels.
This is important to allow the entry code, running in kernel mode, to
access the full 64-bit address space right up to the point of entering
the guest, and immediately after exiting the guest, so it can safely
restore & save the guest context from 64-bit segments.
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 e41637d8
...@@ -61,6 +61,12 @@ ...@@ -61,6 +61,12 @@
#define CALLFRAME_SIZ 32 #define CALLFRAME_SIZ 32
#ifdef CONFIG_64BIT
#define ST0_KX_IF_64 ST0_KX
#else
#define ST0_KX_IF_64 0
#endif
static unsigned int scratch_vcpu[2] = { C0_DDATA_LO }; static unsigned int scratch_vcpu[2] = { C0_DDATA_LO };
static unsigned int scratch_tmp[2] = { C0_ERROREPC }; static unsigned int scratch_tmp[2] = { C0_ERROREPC };
...@@ -204,7 +210,7 @@ void *kvm_mips_build_vcpu_run(void *addr) ...@@ -204,7 +210,7 @@ void *kvm_mips_build_vcpu_run(void *addr)
* Setup status register for running the guest in UM, interrupts * Setup status register for running the guest in UM, interrupts
* are disabled * are disabled
*/ */
UASM_i_LA(&p, K0, ST0_EXL | KSU_USER | ST0_BEV); UASM_i_LA(&p, K0, ST0_EXL | KSU_USER | ST0_BEV | ST0_KX_IF_64);
uasm_i_mtc0(&p, K0, C0_STATUS); uasm_i_mtc0(&p, K0, C0_STATUS);
uasm_i_ehb(&p); uasm_i_ehb(&p);
...@@ -217,7 +223,7 @@ void *kvm_mips_build_vcpu_run(void *addr) ...@@ -217,7 +223,7 @@ void *kvm_mips_build_vcpu_run(void *addr)
* interrupt mask as it was but make sure that timer interrupts * interrupt mask as it was but make sure that timer interrupts
* are enabled * are enabled
*/ */
uasm_i_addiu(&p, K0, ZERO, ST0_EXL | KSU_USER | ST0_IE); uasm_i_addiu(&p, K0, ZERO, ST0_EXL | KSU_USER | ST0_IE | ST0_KX_IF_64);
uasm_i_andi(&p, V0, V0, ST0_IM); uasm_i_andi(&p, V0, V0, ST0_IM);
uasm_i_or(&p, K0, K0, V0); uasm_i_or(&p, K0, K0, V0);
uasm_i_mtc0(&p, K0, C0_STATUS); uasm_i_mtc0(&p, K0, C0_STATUS);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment