diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2021-01-18 09:28:08 +0300 |
|---|---|---|
| committer | Paul Mackerras <paulus@ozlabs.org> | 2021-02-10 06:31:08 +0300 |
| commit | 078ebe35fc0a8ab847809765be34937e656e70a6 (patch) | |
| tree | 46b07713cc315f5b9f234c7434715839724bc3b3 /arch/powerpc/kvm/book3s_hv_rmhandlers.S | |
| parent | 68ad28a4cdd478fa2ae37951b911ab664011098b (diff) | |
| download | linux-078ebe35fc0a8ab847809765be34937e656e70a6.tar.xz | |
KVM: PPC: Book3S HV: No need to clear radix host SLB before loading HPT guest
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 'arch/powerpc/kvm/book3s_hv_rmhandlers.S')
| -rw-r--r-- | arch/powerpc/kvm/book3s_hv_rmhandlers.S | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S index 174e7b6eba34..e413d8e34dd8 100644 --- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S +++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S @@ -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) |