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

Commit da15bf43 authored by Liu Yu's avatar Liu Yu Committed by Marcelo Tosatti
Browse files

KVM: PPC E500: fix tlbcfg emulation 



commit 55fb1027c1cf9797dbdeab48180da530e81b1c39 doesn't update tlbcfg correctly.
Fix it.

And since guest OS likes 'fixed' hardware,
initialize tlbcfg everytime when guest access is useless.
So move this part to init code.

Signed-off-by: default avatarLiu Yu <yu.liu@freescale.com>
Acked-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent a9040f27

arch/powerpc/include/asm/kvm_e500.h

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ struct kvmppc_vcpu_e500 { 
	u32 l1csr1;

	u32 hid0;

	u32 hid1;

	u32 tlb0cfg;

	u32 tlb1cfg;



	struct kvm_vcpu vcpu;

};

arch/powerpc/kvm/e500_emulate.c

+2 −18
Original line number Diff line number Diff line
@@ -164,25 +164,9 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt) 
		kvmppc_set_gpr(vcpu, rt, vcpu_e500->mas7); break;



	case SPRN_TLB0CFG:

	{

		ulong tmp = SPRN_TLB0CFG;



		tmp &= ~0xfffUL;

		tmp |= vcpu_e500->guest_tlb_size[0];

		kvmppc_set_gpr(vcpu, rt, tmp);

		break;

	}



		kvmppc_set_gpr(vcpu, rt, vcpu_e500->tlb0cfg); break;

	case SPRN_TLB1CFG:

	{

		ulong tmp = SPRN_TLB1CFG;



		tmp &= ~0xfffUL;

		tmp |= vcpu_e500->guest_tlb_size[1];

		kvmppc_set_gpr(vcpu, rt, tmp);

		break;

	}



		kvmppc_set_gpr(vcpu, rt, vcpu_e500->tlb1cfg); break;

	case SPRN_L1CSR0:

		kvmppc_set_gpr(vcpu, rt, vcpu_e500->l1csr0); break;

	case SPRN_L1CSR1:

arch/powerpc/kvm/e500_tlb.c

+6 −0
Original line number Diff line number Diff line
@@ -728,6 +728,12 @@ int kvmppc_e500_tlb_init(struct kvmppc_vcpu_e500 *vcpu_e500) 
	if (vcpu_e500->shadow_pages[1] == NULL)

		goto err_out_page0;



	/* Init TLB configuration register */

	vcpu_e500->tlb0cfg = mfspr(SPRN_TLB0CFG) & ~0xfffUL;

	vcpu_e500->tlb0cfg |= vcpu_e500->guest_tlb_size[0];

	vcpu_e500->tlb1cfg = mfspr(SPRN_TLB1CFG) & ~0xfffUL;

	vcpu_e500->tlb1cfg |= vcpu_e500->guest_tlb_size[1];



	return 0;



err_out_page0: