diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c
index be18e2d..5cff992 100644
--- a/arch/arm64/kvm/hyp/switch.c
+++ b/arch/arm64/kvm/hyp/switch.c
@@ -57,7 +57,7 @@ static void __hyp_text __activate_traps_nvhe(void)
        u64 val;

        val = CPTR_EL2_DEFAULT;
-       val |= CPTR_EL2_TTA | CPTR_EL2_TFP;
+       val |= CPTR_EL2_TTA;// | CPTR_EL2_TFP;
        kvm_write_sysreg(val, cptr_el2);
 }

@@ -253,6 +253,8 @@ static int __hyp_text __guest_run(struct kvm_vcpu *vcpu)
        host_ctxt = kern_hyp_va(vcpu->arch.host_cpu_context);
        guest_ctxt = &vcpu->arch.ctxt;

+               __fpsimd_save_state(&host_ctxt->gp_regs.fp_regs);
+               __fpsimd_restore_state(&guest_ctxt->gp_regs.fp_regs);
        __sysreg_save_host_state(host_ctxt);
        __debug_cond_save_host_state(vcpu);

@@ -290,10 +292,10 @@ again:

        __sysreg_restore_host_state(host_ctxt);

-       if (fp_enabled) {
+       //if (fp_enabled) {
                __fpsimd_save_state(&guest_ctxt->gp_regs.fp_regs);
                __fpsimd_restore_state(&host_ctxt->gp_regs.fp_regs);
-       }
+       //}

        __debug_save_state(vcpu, kern_hyp_va(vcpu->arch.debug_ptr), guest_ctxt);
        __debug_cond_restore_host_state(vcpu);