Commit 151b92c9 authored by Yicong Yang's avatar Yicong Yang Committed by Will Deacon
Browse files

KVM: arm64: Enable FEAT_{LS64, LS64_V} in the supported guest 



Using FEAT_{LS64, LS64_V} instructions in a guest is also controlled
by HCRX_EL2.{EnALS, EnASR}. Enable it if guest has related feature.

Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarOliver Upton <oupton@kernel.org>
Signed-off-by: default avatarYicong Yang <yangyicong@hisilicon.com>
Signed-off-by: default avatarZhou Wang <wangzhou1@hisilicon.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent dea58da4

arch/arm64/include/asm/kvm_emulate.h

+6 −0
Original line number Diff line number Diff line
@@ -695,6 +695,12 @@ static inline void vcpu_set_hcrx(struct kvm_vcpu *vcpu) 


		if (kvm_has_sctlr2(kvm))

			vcpu->arch.hcrx_el2 |= HCRX_EL2_SCTLR2En;



		if (kvm_has_feat(kvm, ID_AA64ISAR1_EL1, LS64, LS64))

			vcpu->arch.hcrx_el2 |= HCRX_EL2_EnALS;



		if (kvm_has_feat(kvm, ID_AA64ISAR1_EL1, LS64, LS64_V))

			vcpu->arch.hcrx_el2 |= HCRX_EL2_EnASR;

	}

}

#endif /* __ARM64_KVM_EMULATE_H__ */