1 files changed, 23 insertions, 2 deletions

diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
index 6dcc974fa2b4..1e857e6e66b5 100644
--- a/virt/kvm/arm/vgic.c
+++ b/virt/kvm/arm/vgic.c
@@ -1036,11 +1036,26 @@ static u64 vgic_v2_get_elrsr(const struct kvm_vcpu *vcpu)
         return val;
 }
 
+static u64 vgic_v2_get_eisr(const struct kvm_vcpu *vcpu)
+{
+        u64 val;
+
+#if BITS_PER_LONG == 64
+        val  = vcpu->arch.vgic_cpu.vgic_v2.vgic_eisr[1];
+        val <<= 32;
+        val |= vcpu->arch.vgic_cpu.vgic_v2.vgic_eisr[0];
+#else
+        val = *(u64 *)vcpu->arch.vgic_cpu.vgic_v2.vgic_eisr;
+#endif
+        return val;
+}
+
 static const struct vgic_ops vgic_ops = {
         .get_lr                 = vgic_v2_get_lr,
         .set_lr                 = vgic_v2_set_lr,
         .sync_lr_elrsr          = vgic_v2_sync_lr_elrsr,
         .get_elrsr              = vgic_v2_get_elrsr,
+        .get_eisr               = vgic_v2_get_eisr,
 };
 
 static struct vgic_lr vgic_get_lr(const struct kvm_vcpu *vcpu, int lr)
@@ -1065,6 +1080,11 @@ static inline u64 vgic_get_elrsr(struct kvm_vcpu *vcpu)
         return vgic_ops.get_elrsr(vcpu);
 }
 
+static inline u64 vgic_get_eisr(struct kvm_vcpu *vcpu)
+{
+        return vgic_ops.get_eisr(vcpu);
+}
+
 static void vgic_retire_lr(int lr_nr, int irq, struct kvm_vcpu *vcpu)
 {
         struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
@@ -1271,10 +1291,11 @@ static bool vgic_process_maintenance(struct kvm_vcpu *vcpu)
                  * Some level interrupts have been EOIed. Clear their
                  * active bit.
                  */
+                u64 eisr = vgic_get_eisr(vcpu);
+                unsigned long *eisr_ptr = (unsigned long *)&eisr;
                 int lr;
 
-                for_each_set_bit(lr, (unsigned long *)vgic_cpu->vgic_v2.vgic_eisr,
-                                 vgic_cpu->nr_lr) {
+                for_each_set_bit(lr, eisr_ptr, vgic_cpu->nr_lr) {
                         struct vgic_lr vlr = vgic_get_lr(vcpu, lr);
 
                         vgic_irq_clear_active(vcpu, vlr.irq);