Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48c53db2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull kvm fixes from Paolo Bonzini:
 "Two bugfixes for arm64.  I will have another pull request next week,
  but otherwise things are calm"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  arm64: KVM: Fix HCR setting for 32bit guests
  arm64: KVM: Fix TLB invalidation by IPA/VMID
parents 6fb400d3 801f6772

arch/arm64/include/asm/kvm_emulate.h

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ void kvm_inject_pabt(struct kvm_vcpu *vcpu, unsigned long addr); 
static inline void vcpu_reset_hcr(struct kvm_vcpu *vcpu)

{

	vcpu->arch.hcr_el2 = HCR_GUEST_FLAGS;

	if (test_bit(KVM_ARM_VCPU_EL1_32BIT, vcpu->arch.features))

		vcpu->arch.hcr_el2 &= ~HCR_RW;

}



static inline unsigned long *vcpu_pc(const struct kvm_vcpu *vcpu)

arch/arm64/kvm/hyp.S

+1 −0
Original line number Diff line number Diff line
@@ -1014,6 +1014,7 @@ ENTRY(__kvm_tlb_flush_vmid_ipa) 
	 * Instead, we invalidate Stage-2 for this IPA, and the

	 * whole of Stage-1. Weep...

	 */

	lsr	x1, x1, #12

	tlbi	ipas2e1is, x1

	/*

	 * We have to ensure completion of the invalidation at Stage-2,

arch/arm64/kvm/reset.c

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) 
			if (!cpu_has_32bit_el1())

				return -EINVAL;

			cpu_reset = &default_regs_reset32;

			vcpu->arch.hcr_el2 &= ~HCR_RW;

		} else {

			cpu_reset = &default_regs_reset;

		}