From patchwork Wed Jan 14 16:47:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hollis Blanchard X-Patchwork-Id: 2348 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n0EGiL0g029346 for ; Wed, 14 Jan 2009 08:44:22 -0800 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764545AbZANQrz (ORCPT ); Wed, 14 Jan 2009 11:47:55 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1764209AbZANQry (ORCPT ); Wed, 14 Jan 2009 11:47:54 -0500 Received: from e34.co.us.ibm.com ([32.97.110.152]:35130 "EHLO e34.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764528AbZANQrr (ORCPT ); Wed, 14 Jan 2009 11:47:47 -0500 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e34.co.us.ibm.com (8.13.1/8.13.1) with ESMTP id n0EGkXcL023345; Wed, 14 Jan 2009 09:46:33 -0700 Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id n0EGleaR034808; Wed, 14 Jan 2009 09:47:44 -0700 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n0EGleKs003213; Wed, 14 Jan 2009 09:47:40 -0700 Received: from localhost.localdomain (slate.austin.ibm.com [9.53.41.42]) by d03av03.boulder.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n0EGlcIH003111; Wed, 14 Jan 2009 09:47:39 -0700 From: Hollis Blanchard To: avi@redhat.com Cc: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, Liu Yu Subject: [PATCH 3/3] Subject: kvm: ppc: Move to new TLB invalidate interface Date: Wed, 14 Jan 2009 10:47:38 -0600 Message-Id: <213c745e23cd10ed09d2fa022b89e7db533e4cb2.1231950854.git.hollisb@us.ibm.com> X-Mailer: git-send-email 1.5.6.6 In-Reply-To: <1231951658-21108-1-git-send-email-hollisb@us.ibm.com> References: <1231951658-21108-1-git-send-email-hollisb@us.ibm.com> In-Reply-To: References: Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Liu Yu Commit 2a4aca1144394653269720ffbb5a325a77abd5fa removed old method _tlbia(). Signed-off-by: Liu Yu Signed-off-by: Hollis Blanchard --- arch/powerpc/kvm/e500_tlb.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/kvm/e500_tlb.c b/arch/powerpc/kvm/e500_tlb.c index e3daf57..d437160 100644 --- a/arch/powerpc/kvm/e500_tlb.c +++ b/arch/powerpc/kvm/e500_tlb.c @@ -20,6 +20,7 @@ #include #include +#include "../mm/mmu_decl.h" #include "e500_tlb.h" #define to_htlb1_esel(esel) (tlb1_entry_num - (esel) - 1) @@ -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. */ @@ -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(); } } @@ -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; } @@ -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,