Commit 078ebe35 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Paul Mackerras
Browse files

KVM: PPC: Book3S HV: No need to clear radix host SLB before loading HPT guest 



Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent 68ad28a4

arch/powerpc/kvm/book3s_hv_rmhandlers.S

+5 −1
Original line number Diff line number Diff line
@@ -902,15 +902,19 @@ ALT_FTR_SECTION_END_IFCLR(CPU_FTR_ARCH_300) 
	cmpdi	r3, 512		/* 1 microsecond */

	blt	hdec_soon



	/* For hash guest, clear out and reload the SLB */

	ld	r6, VCPU_KVM(r4)

	lbz	r0, KVM_RADIX(r6)

	cmpwi	r0, 0

	bne	9f



	/* For hash guest, clear out and reload the SLB */

BEGIN_MMU_FTR_SECTION

	/* Radix host won't have populated the SLB, so no need to clear */

	li	r6, 0

	slbmte	r6, r6

	slbia

	ptesync

END_MMU_FTR_SECTION_IFCLR(MMU_FTR_TYPE_RADIX)



	/* Load up guest SLB entries (N.B. slb_max will be 0 for radix) */

	lwz	r5,VCPU_SLB_MAX(r4)