From: Yicong Yang <yangyic...@hisilicon.com>

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

Signed-off-by: Yicong Yang <yangyic...@hisilicon.com>
---
 arch/arm64/include/asm/kvm_emulate.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm64/include/asm/kvm_emulate.h 
b/arch/arm64/include/asm/kvm_emulate.h
index d7cf66573aca..9165fcf719ab 100644
--- a/arch/arm64/include/asm/kvm_emulate.h
+++ b/arch/arm64/include/asm/kvm_emulate.h
@@ -684,6 +684,12 @@ static inline void vcpu_set_hcrx(struct kvm_vcpu *vcpu)
 
                if (kvm_has_fpmr(kvm))
                        vcpu->arch.hcrx_el2 |= HCRX_EL2_EnFPM;
+
+               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__ */
-- 
2.24.0


Reply via email to