1 files changed, 10 insertions, 1 deletions

diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index a4363735d3f8..774d72155904 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -194,7 +194,16 @@ static bool access_dcsw(struct kvm_vcpu *vcpu,
         if (!p->is_write)
                 return read_from_write_only(vcpu, p, r);
 
-        kvm_set_way_flush(vcpu);
+        /*
+         * Only track S/W ops if we don't have FWB. It still indicates
+         * that the guest is a bit broken (S/W operations should only
+         * be done by firmware, knowing that there is only a single
+         * CPU left in the system, and certainly not from non-secure
+         * software).
+         */
+        if (!cpus_have_const_cap(ARM64_HAS_STAGE2_FWB))
+                kvm_set_way_flush(vcpu);
+
         return true;
 }