From: Zhang Wei Date: Fri, 25 Jan 2008 07:12:57 +0000 Subject: [kvm-ppc-devel] [PATCH 3/5] Use TLB macro instead of MMU operations Message-Id: <12012451804195-git-send-email-wei.zhang@freescale.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: kvm-ppc@vger.kernel.org The 44x dependence MMU operations can be replaced by TLB marco, which modifications are prepared for adding e500 MMU macro to booke_interrupts.S Signed-off-by: Zhang Wei --- arch/powerpc/kvm/44x_int_asm.h | 41 +++++++++++++++++++++ arch/powerpc/kvm/booke_interrupts.S | 67 ++++++++++------------------------- include/asm-powerpc/kvm_asm.h | 4 ++ 3 files changed, 64 insertions(+), 48 deletions(-) create mode 100644 arch/powerpc/kvm/44x_int_asm.h diff --git a/arch/powerpc/kvm/44x_int_asm.h b/arch/powerpc/kvm/44x_int_asm.h new file mode 100644 index 0000000..73fe2d8 --- /dev/null +++ b/arch/powerpc/kvm/44x_int_asm.h @@ -0,0 +1,41 @@ +#ifndef __ARCH_POWERPC_KVM_44X_INT_ASM_H__ +#define __ARCH_POWERPC_KVM_44X_INT_ASM_H__ + +/* Load TLB size to rd register */ +.macro LOAD_TLB_SIZE rd + li \rd, PPC44x_TLB_SIZE +.endm + +/* TLB entry will be loaded from rd + 4 address to r_entry_idx entry */ +.macro TLB_ENTRY_LOAD r_entry_idx, rd, ra + lwzu \rd, 4(\ra) + mtspr SPRN_MMUCR, \rd + lwzu \rd, 4(\ra) + tlbwe \rd, \r_entry_idx, PPC44x_TLB_PAGEID + lwzu \rd, 4(\ra) + tlbwe \rd, \r_entry_idx, PPC44x_TLB_XLAT + lwzu \rd, 4(\ra) + tlbwe \rd, \r_entry_idx, PPC44x_TLB_ATTRIB +.endm + +/* TLB entry will be saved to rd + 4 address */ +.macro TLB_ENTRY_SAVE r_entry_idx, rd, ra + mfspr \rd, SPRN_MMUCR + stwu \rd, 4(\ra) + tlbre \rd, \r_entry_idx, PPC44x_TLB_PAGEID + stwu \rd, 4(\ra) + tlbre \rd, \r_entry_idx, PPC44x_TLB_XLAT + stwu \rd, 4(\ra) + tlbre \rd, \r_entry_idx, PPC44x_TLB_ATTRIB + stwu \rd, 4(\ra) +.endm + +.macro SAVE_MMUCR rd + mfspr \rd, SPRN_MMUCR +.endm + +.macro LOAD_MMUCR rd + mtspr SPRN_MMUCR, \rd +.endm + +#endif /* __ARCH_POWERPC_KVM_44X_INT_ASM_H__ */ diff --git a/arch/powerpc/kvm/booke_interrupts.S b/arch/powerpc/kvm/booke_interrupts.S index be6970d..96130dc 100644 --- a/arch/powerpc/kvm/booke_interrupts.S +++ b/arch/powerpc/kvm/booke_interrupts.S @@ -20,7 +20,12 @@ #include #include #include + +#if defined(CONFIG_KVM_POWERPC_440) #include +#include "44x_int_asm.h" +#endif + #include #include @@ -113,24 +118,17 @@ _GLOBAL(kvm_trampoline_resume_host) /* Future optimization: only reload host kernel mappings here, and do * the rest in heavyweight_exit. */ lwz r9, VCPU_TRAMPOLINE_TLBE(r4) - mfspr r8, SPRN_MMUCR /* Save host MMUCR. */ + SAVE_MMUCR r8 /* Save host MMUCR. */ addi r3, r4, VCPU_HOST_TLB - 4 li r6, 0 1: - cmpwi cr0, r6, PPC44x_TLB_SIZE + cmpwi cr0, r6, KVMPPC_HOST_TLB_SIZE cmpl cr1, r6, r9 /* Is this greater than the size of the TLB? */ beq cr0, ..host_tlb_reload_done /* Is this the trampoline entry? */ beq cr1, ..skip_entry - lwzu r7, 4(r3) - mtspr SPRN_MMUCR, r7 - lwzu r7, 4(r3) - tlbwe r7, r6, PPC44x_TLB_PAGEID - lwzu r7, 4(r3) - tlbwe r7, r6, PPC44x_TLB_XLAT - lwzu r7, 4(r3) - tlbwe r7, r6, PPC44x_TLB_ATTRIB + TLB_ENTRY_LOAD r6, r7, r3 addi r6, r6, 1 b 1b ..skip_entry: @@ -154,23 +152,15 @@ _GLOBAL(kvm_trampoline_resume_host_len) _GLOBAL(kvm_trampoline_resume_guest) /* Load all shadow TLB mappings. For simplicity, this includes a reload * of the trampoline mapping. */ - mfspr r8, SPRN_MMUCR /* Save host MMUCR. */ + SAVE_MMUCR r8 /* Save host MMUCR. */ addi r3, r4, VCPU_SHADOW_TLB - 4 li r6, 0 1: - lwzu r7, 4(r3) - /* Set TID. (The other MMUCR bits are restored later.) */ - mtspr SPRN_MMUCR, r7 - lwzu r7, 4(r3) - tlbwe r7, r6, PPC44x_TLB_PAGEID - lwzu r7, 4(r3) - tlbwe r7, r6, PPC44x_TLB_XLAT - lwzu r7, 4(r3) - tlbwe r7, r6, PPC44x_TLB_ATTRIB + TLB_ENTRY_LOAD r6, r7, r3 addi r6, r6, 1 - cmpwi r6, PPC44x_TLB_SIZE + cmpwi r6, KVMPPC_HOST_TLB_SIZE blt 1b - mtspr SPRN_MMUCR, r8 /* Restore host MMUCR. */ + LOAD_MMUCR r8 /* Restore host MMUCR. */ /* Finish loading guest volatiles and jump to guest. */ lwz r3, VCPU_CTR(r4) @@ -207,15 +197,9 @@ resume_host_continued: lwz r6, VCPU_TRAMPOLINE_TLBE(r4) mulli r3, r9, TLBE_BYTES add r3, r3, r4 - lwz r7, (VCPU_HOST_TLB + 0)(r3) - mtspr SPRN_MMUCR, r7 - lwz r7, (VCPU_HOST_TLB + 4)(r3) - tlbwe r7, r6, PPC44x_TLB_PAGEID - lwz r7, (VCPU_HOST_TLB + 8)(r3) - tlbwe r7, r6, PPC44x_TLB_XLAT - lwz r7, (VCPU_HOST_TLB + 12)(r3) - tlbwe r7, r6, PPC44x_TLB_ATTRIB - mtspr SPRN_MMUCR, r8 /* Restore MMUCR. */ + addi r3, r3, VCPU_HOST_TLB - 4 + TLB_ENTRY_LOAD r6, r7, r3 + LOAD_MMUCR r8 /* Restore MMUCR. */ /* Don't need isync here because nothing in the host is using the * trampoline mapping in the first place. */ @@ -449,30 +433,17 @@ lightweight_exit: addi r3, r4, VCPU_HOST_TLB - 4 li r6, 0 1: - tlbre r7, r6, PPC44x_TLB_PAGEID - mfspr r5, SPRN_MMUCR - stwu r5, 4(r3) - stwu r7, 4(r3) - tlbre r7, r6, PPC44x_TLB_XLAT - stwu r7, 4(r3) - tlbre r7, r6, PPC44x_TLB_ATTRIB - stwu r7, 4(r3) + TLB_ENTRY_SAVE r6, r7, r3 addi r6, r6, 1 - cmpwi r6, PPC44x_TLB_SIZE + cmpwi r6, KVMPPC_HOST_TLB_SIZE blt 1b /* Create the trampoline mapping. */ lwz r6, VCPU_TRAMPOLINE_TLBE(r4) mulli r3, r6, TLBE_BYTES add r3, r3, r4 - lwz r7, (VCPU_SHADOW_TLB + 0)(r3) - mtspr SPRN_MMUCR, r7 - lwz r7, (VCPU_SHADOW_TLB + 4)(r3) - tlbwe r7, r6, PPC44x_TLB_PAGEID - lwz r7, (VCPU_SHADOW_TLB + 8)(r3) - tlbwe r7, r6, PPC44x_TLB_XLAT - lwz r7, (VCPU_SHADOW_TLB + 12)(r3) - tlbwe r7, r6, PPC44x_TLB_ATTRIB + addi r3, r3, VCPU_SHADOW_TLB - 4 + TLB_ENTRY_LOAD r6, r7, r3 /* Switch the IVPR to the trampoline. */ /* XXX If we take a TLB miss after this we're screwed! */ diff --git a/include/asm-powerpc/kvm_asm.h b/include/asm-powerpc/kvm_asm.h index 8ed6b0b..3c5da1d 100644 --- a/include/asm-powerpc/kvm_asm.h +++ b/include/asm-powerpc/kvm_asm.h @@ -57,4 +57,8 @@ #define KVM_PPC_IOCTL_GETTLB 5 #define KVM_PPC_IOCTL_SETTLB 6 +#if defined(CONFIG_KVM_POWERPC_440) +#define KVMPPC_HOST_TLB_SIZE PPC44x_TLB_SIZE +#endif + #endif /* __POWERPC_KVM_ASM_H__ */ -- 1.5.2 ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ kvm-ppc-devel mailing list kvm-ppc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-ppc-devel