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

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

MIPS: KVM: Emulate generic QEMU machine on r6 T&E 



Default the guest PRId register to represent a generic QEMU machine
instead of a 24kc on MIPSr6. 24kc isn't supported by r6 Linux kernels.

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 8eeab81c

arch/mips/kvm/trap_emul.c

+7 −1
Original line number Diff line number Diff line
@@ -431,9 +431,15 @@ static int kvm_trap_emul_vcpu_setup(struct kvm_vcpu *vcpu) 


	/*

	 * Arch specific stuff, set up config registers properly so that the

	 * guest will come up as expected, for now we simulate a MIPS 24kc

	 * guest will come up as expected

	 */

#ifndef CONFIG_CPU_MIPSR6

	/* r2-r5, simulate a MIPS 24kc */

	kvm_write_c0_guest_prid(cop0, 0x00019300);

#else

	/* r6+, simulate a generic QEMU machine */

	kvm_write_c0_guest_prid(cop0, 0x00010000);

#endif

	/*

	 * Have config1, Cacheable, noncoherent, write-back, write allocate.

	 * Endianness, arch revision & virtually tagged icache should match