diff options
| author |  Fuad Tabba <tabba@google.com>
| 2023-07-24 13:38:29 +0100 |
|---|---|---|
| committer |  Oliver Upton <oliver.upton@linux.dev>
| 2023-07-26 17:08:30 +0000 |
| commit | 375110ab51dec5dcd077b8fa95075b2c67499119 (patch) | |
| tree | 3797ade0287d37817cdf8550953f6eeb9d44aceb /arch/arm64/include/asm/kvm_emulate.h | |
| parent | KVM: arm64: Fix resetting SVE trap values on reset for hVHE (diff) | |
| download | linux-375110ab51dec5dcd077b8fa95075b2c67499119.tar.gz linux-375110ab51dec5dcd077b8fa95075b2c67499119.tar.bz2 linux-375110ab51dec5dcd077b8fa95075b2c67499119.zip | |
KVM: arm64: Fix resetting SME trap values on reset for (h)VHE
Ensure that SME traps are disabled for (h)VHE when getting the
reset value for the architectural feature control register.
Fixes: 75c76ab5a641 ("KVM: arm64: Rework CPTR_EL2 programming for HVHE configuration")
Signed-off-by: Fuad Tabba <tabba@google.com>
Reviewed-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20230724123829.2929609-9-tabba@google.com
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
Diffstat (limited to 'arch/arm64/include/asm/kvm_emulate.h')
| -rw-r--r-- | arch/arm64/include/asm/kvm_emulate.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h index adfb7d0ac55b..3d6725ff0bf6 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -586,12 +586,16 @@ static __always_inline u64 kvm_get_reset_cptr_el2(struct kvm_vcpu *vcpu) if (has_vhe()) { val = (CPACR_EL1_FPEN_EL0EN | CPACR_EL1_FPEN_EL1EN | CPACR_EL1_ZEN_EL1EN); + if (cpus_have_final_cap(ARM64_SME)) + val |= CPACR_EL1_SMEN_EL1EN; } else if (has_hvhe()) { val = (CPACR_EL1_FPEN_EL0EN | CPACR_EL1_FPEN_EL1EN); if (!vcpu_has_sve(vcpu) || (vcpu->arch.fp_state != FP_STATE_GUEST_OWNED)) val |= CPACR_EL1_ZEN_EL1EN | CPACR_EL1_ZEN_EL0EN; + if (cpus_have_final_cap(ARM64_SME)) + val |= CPACR_EL1_SMEN_EL1EN | CPACR_EL1_SMEN_EL0EN; } else { val = CPTR_NVHE_EL2_RES1; |