diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v3.c b/arch/arm64/kvm/vgic/vgic-mmio-v3.c
index b6bdf22abab11bb43f6d8a7cd4a08369db17ac70..fd29102a53880b0cabd5c1b7ec4dbbc116c96a66 100644
--- a/arch/arm64/kvm/vgic/vgic-mmio-v3.c
+++ b/arch/arm64/kvm/vgic/vgic-mmio-v3.c
@@ -377,32 +377,35 @@ static int vgic_v3_uaccess_write_pending(struct kvm_vcpu *vcpu,
 		struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, intid + i);
 
 		raw_spin_lock_irqsave(&irq->irq_lock, flags);
-		if (test_bit(i, &val)) {
-			/*
-			 * pending_latch is set irrespective of irq type
-			 * (level or edge) to avoid dependency that VM should
-			 * restore irq config before pending info.
-			 */
-			irq->pending_latch = true;
-			vgic_queue_irq_unlock(vcpu->kvm, irq, flags);
-		} else {
-			/**
-			 * workaround: On reset, userspace clears pending status
-			 * for all PPIs and SGIs by writing all 0's to
-			 * GICR_ISPENDR0. The pending state of vtimer interrupt
-			 * is somehow staying in redistributor and we have to
-			 * explicitly clear it...
-			 *
-			 * P.S., irq->vtimer_info is NULL on restore.
-			 */
-			if (irq->vtimer_info)
-				WARN_ON_ONCE(irq_set_irqchip_state(irq->host_irq,
-							IRQCHIP_STATE_PENDING,
-							false));
+
+		/*
+		 * pending_latch is set irrespective of irq type
+		 * (level or edge) to avoid dependency that VM should
+		 * restore irq config before pending info.
+		 */
+		irq->pending_latch = test_bit(i, &val);
+
+		/*
+		 * workaround: On reset, userspace clears pending status
+		 * for all PPIs and SGIs by writing all 0's to
+		 * GICR_ISPENDR0. The pending state of vtimer interrupt
+		 * is somehow staying in redistributor and we have to
+		 * explicitly clear it...
+		 *
+		 * P.S., irq->vtimer_info is NULL on restore.
+		 */
+		if ((irq->hw && vgic_irq_is_sgi(irq->intid)) || irq->vtimer_info) {
+			irq_set_irqchip_state(irq->host_irq,
+					      IRQCHIP_STATE_PENDING,
+					      irq->pending_latch);
 			irq->pending_latch = false;
-			raw_spin_unlock_irqrestore(&irq->irq_lock, flags);
 		}
 
+		if (irq->pending_latch)
+			vgic_queue_irq_unlock(vcpu->kvm, irq, flags);
+		else
+			raw_spin_unlock_irqrestore(&irq->irq_lock, flags);
+
 		vgic_put_irq(vcpu->kvm, irq);
 	}