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: Liu Yu <yu.liu@freescale.com>
Acked-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

diff --git a/arch/powerpc/include/asm/kvm_e500.h b/arch/powerpc/include/asm/kvm_e500.h
index 569dfd31ee79d2d0bea7cc0be9c6519e65330d14..7fea26fffb25f692f50f71d8e4b3d858d9478aad 100644 (file)
--- a/arch/powerpc/include/asm/kvm_e500.h
+++ b/arch/powerpc/include/asm/kvm_e500.h
@@ -56,6 +56,8 @@ struct kvmppc_vcpu_e500 {
        u32 l1csr1;
        u32 hid0;
        u32 hid1;
+       u32 tlb0cfg;
+       u32 tlb1cfg;
 
        struct kvm_vcpu vcpu;
 };

diff --git a/arch/powerpc/kvm/e500_emulate.c b/arch/powerpc/kvm/e500_emulate.c
index 95f8ec8fdc71a14a35046f1a5d6b8b9d54b28b96..8e3edfbc963412e39813dbb7ccff1b8a57bdcfd0 100644 (file)
--- a/arch/powerpc/kvm/e500_emulate.c
+++ b/arch/powerpc/kvm/e500_emulate.c
@@ -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:

diff --git a/arch/powerpc/kvm/e500_tlb.c b/arch/powerpc/kvm/e500_tlb.c
index 6a7fc012b93f82d0824eaaf6d546247f48253a91..0d772e6b6318cf30f081b5ec76c9bfe035ca5250 100644 (file)
--- a/arch/powerpc/kvm/e500_tlb.c
+++ b/arch/powerpc/kvm/e500_tlb.c
@@ -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: