Skip to content

Commit

Permalink
KVM: ppc: Move to new TLB invalidate interface
Browse files Browse the repository at this point in the history
Commit 2a4aca1 removed old method _tlbia().

Signed-off-by: Liu Yu <yu.liu@freescale.com>
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
  • Loading branch information
Liu Yu authored and avikivity committed Mar 24, 2009
1 parent fb2838d commit 9aa4dd5
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions arch/powerpc/kvm/e500_tlb.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <asm/kvm_ppc.h>
#include <asm/kvm_e500.h>

#include "../mm/mmu_decl.h"
#include "e500_tlb.h"

#define to_htlb1_esel(esel) (tlb1_entry_num - (esel) - 1)
Expand Down Expand Up @@ -158,7 +159,7 @@ void kvmppc_e500_tlb_load(struct kvm_vcpu *vcpu, int cpu)

void kvmppc_e500_tlb_put(struct kvm_vcpu *vcpu)
{
_tlbia();
_tlbil_all();
}

/* Search the guest TLB for a matching entry. */
Expand Down Expand Up @@ -362,11 +363,10 @@ void kvmppc_mmu_priv_switch(struct kvm_vcpu *vcpu, int usermode)
int i;

/* XXX Replace loop with fancy data structures. */
/* needn't set modified since tlbia will make TLB1 coherent */
for (i = 0; i < tlb1_max_shadow_size(); i++)
kvmppc_e500_stlbe_invalidate(vcpu_e500, 1, i);

_tlbia();
_tlbil_all();
}
}

Expand Down Expand Up @@ -417,7 +417,7 @@ int kvmppc_e500_emul_tlbivax(struct kvm_vcpu *vcpu, int ra, int rb)
kvmppc_e500_gtlbe_invalidate(vcpu_e500, tlbsel, esel);
}

_tlbia();
_tlbil_all();

return EMULATE_DONE;
}
Expand Down Expand Up @@ -604,7 +604,7 @@ void kvmppc_mmu_destroy(struct kvm_vcpu *vcpu)
kvmppc_e500_shadow_release(vcpu_e500, tlbsel, i);

/* discard all guest mapping */
_tlbia();
_tlbil_all();
}

void kvmppc_mmu_map(struct kvm_vcpu *vcpu, u64 eaddr, gpa_t gpaddr,
Expand Down

0 comments on commit 9aa4dd5

Please sign in to comment.