On Thu, 2008-12-18 at 20:22 +0800, Liu Yu wrote:
> When itlb or dtlb miss happens, E500 needs to update some mmu registers.
> So that the auto-load mechanism can work on E500 when write a tlb entry.
>
> Signed-off-by: Liu Yu <yu.liu@xxxxxxxxxxxxx>
> ---
> arch/powerpc/include/asm/kvm_ppc.h | 2 ++
> arch/powerpc/kvm/44x_tlb.c | 8 ++++++++
> arch/powerpc/kvm/booke.c | 2 ++
> 3 files changed, 12 insertions(+), 0 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h
> index f4b041b..82547c8 100644
> --- a/arch/powerpc/include/asm/kvm_ppc.h
> +++ b/arch/powerpc/include/asm/kvm_ppc.h
> @@ -63,6 +63,8 @@ extern int kvmppc_mmu_dtlb_index(struct kvm_vcpu *vcpu, gva_t eaddr);
> extern int kvmppc_mmu_itlb_index(struct kvm_vcpu *vcpu, gva_t eaddr);
> extern gpa_t kvmppc_mmu_xlate(struct kvm_vcpu *vcpu, unsigned int gtlb_index,
> gva_t eaddr);
> +extern void kvmppc_mmu_dtlb_miss(struct kvm_vcpu *vcpu);
> +extern void kvmppc_mmu_itlb_miss(struct kvm_vcpu *vcpu);
>
> extern struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm,
> unsigned int id);
> diff --git a/arch/powerpc/kvm/44x_tlb.c b/arch/powerpc/kvm/44x_tlb.c
> index e67b731..4a16f47 100644
> --- a/arch/powerpc/kvm/44x_tlb.c
> +++ b/arch/powerpc/kvm/44x_tlb.c
> @@ -232,6 +232,14 @@ int kvmppc_mmu_dtlb_index(struct kvm_vcpu *vcpu, gva_t eaddr)
> return kvmppc_44x_tlb_index(vcpu, eaddr, vcpu->arch.pid, as);
> }
>
> +void kvmppc_mmu_itlb_miss(struct kvm_vcpu *vcpu)
> +{
> +}
> +
> +void kvmppc_mmu_dtlb_miss(struct kvm_vcpu *vcpu)
> +{
> +}
> +
> static void kvmppc_44x_shadow_release(struct kvmppc_vcpu_44x *vcpu_44x,
> unsigned int stlb_index)
> {
> diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
> index a73b395..933c406 100644
> --- a/arch/powerpc/kvm/booke.c
> +++ b/arch/powerpc/kvm/booke.c
> @@ -295,6 +295,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
> kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_DTLB_MISS);
> vcpu->arch.dear = vcpu->arch.fault_dear;
> vcpu->arch.esr = vcpu->arch.fault_esr;
> + kvmppc_mmu_dtlb_miss(vcpu);
> kvmppc_account_exit(vcpu, DTLB_REAL_MISS_EXITS);
> r = RESUME_GUEST;
> break;
> @@ -337,6 +338,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
> if (gtlb_index < 0) {
> /* The guest didn't have a mapping for it. */
> kvmppc_booke_queue_irqprio(vcpu, BOOKE_IRQPRIO_ITLB_MISS);
> + kvmppc_mmu_itlb_miss(vcpu);
> kvmppc_account_exit(vcpu, ITLB_REAL_MISS_EXITS);
> break;
> }
I don't think you've supplied an implementation of these hooks for e500.
Does it build with this patch series applied?
--
Hollis Blanchard
IBM Linux Technology Center
--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
