1 files changed, 4 insertions, 3 deletions

diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index c328191aa202..9f19c354b165 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -597,11 +597,12 @@ static inline void kvm_arm_vhe_guest_enter(void)
          * will not signal the CPU of interrupts of lower priority, and the
          * only way to get out will be via guest exceptions.
          * Naturally, we want to avoid this.
+         *
+         * local_daif_mask() already sets GIC_PRIO_PSR_I_SET, we just need a
+         * dsb to ensure the redistributor is forwards EL2 IRQs to the CPU.
          */
-        if (system_uses_irq_prio_masking()) {
-                gic_write_pmr(GIC_PRIO_IRQON);
+        if (system_uses_irq_prio_masking())
                 dsb(sy);
-        }
 }
 
 static inline void kvm_arm_vhe_guest_exit(void)