RISC-V: KVM: Don't check hstateen0 when updating sstateen0 CSR

The hstateen0 will be programmed differently for guest HS-mode
and guest VS/VU-mode so don't check hstateen0.SSTATEEN0 bit when
updating sstateen0 CSR in kvm_riscv_vcpu_swap_in_guest_state()
and kvm_riscv_vcpu_swap_in_host_state().

Signed-off-by: Anup Patel <anup.patel@oss.qualcomm.com>
Reviewed-by: Radim Krčmář <radim.krcmar@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20260120080013.2153519-10-anup.patel@oss.qualcomm.com
Signed-off-by: Anup Patel <anup@brainfault.org>

diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c
index 6929f7ce5948e673795fc0441735ceb4ff1d3d40..a73690eda84b5a85df380259e33ff8655910ded3 100644 (file)
--- a/arch/riscv/kvm/vcpu.c
+++ b/arch/riscv/kvm/vcpu.c
@@ -721,28 +721,22 @@ static __always_inline void kvm_riscv_vcpu_swap_in_guest_state(struct kvm_vcpu *
 {
        struct kvm_vcpu_smstateen_csr *smcsr = &vcpu->arch.smstateen_csr;
        struct kvm_vcpu_csr *csr = &vcpu->arch.guest_csr;
-       struct kvm_vcpu_config *cfg = &vcpu->arch.cfg;
 
        vcpu->arch.host_scounteren = csr_swap(CSR_SCOUNTEREN, csr->scounteren);
        vcpu->arch.host_senvcfg = csr_swap(CSR_SENVCFG, csr->senvcfg);
-       if (riscv_has_extension_unlikely(RISCV_ISA_EXT_SMSTATEEN) &&
-           (cfg->hstateen0 & SMSTATEEN0_SSTATEEN0))
-               vcpu->arch.host_sstateen0 = csr_swap(CSR_SSTATEEN0,
-                                                    smcsr->sstateen0);
+       if (riscv_has_extension_unlikely(RISCV_ISA_EXT_SMSTATEEN))
+               vcpu->arch.host_sstateen0 = csr_swap(CSR_SSTATEEN0, smcsr->sstateen0);
 }
 
 static __always_inline void kvm_riscv_vcpu_swap_in_host_state(struct kvm_vcpu *vcpu)
 {
        struct kvm_vcpu_smstateen_csr *smcsr = &vcpu->arch.smstateen_csr;
        struct kvm_vcpu_csr *csr = &vcpu->arch.guest_csr;
-       struct kvm_vcpu_config *cfg = &vcpu->arch.cfg;
 
        csr->scounteren = csr_swap(CSR_SCOUNTEREN, vcpu->arch.host_scounteren);
        csr->senvcfg = csr_swap(CSR_SENVCFG, vcpu->arch.host_senvcfg);
-       if (riscv_has_extension_unlikely(RISCV_ISA_EXT_SMSTATEEN) &&
-           (cfg->hstateen0 & SMSTATEEN0_SSTATEEN0))
-               smcsr->sstateen0 = csr_swap(CSR_SSTATEEN0,
-                                           vcpu->arch.host_sstateen0);
+       if (riscv_has_extension_unlikely(RISCV_ISA_EXT_SMSTATEEN))
+               smcsr->sstateen0 = csr_swap(CSR_SSTATEEN0, vcpu->arch.host_sstateen0);
 }
 
 /*