KVM: arm64: vgic-v3: Add ICV_DIR_EL1 handler

BugLink: https://bugs.launchpad.net/bugs/1673564
Add a handler for writing the guest's view of the ICC_DIR_EL1
register, performing the deactivation of an interrupt if EOImode
is set ot 1.

Tested-by: Alexander Graf <agraf@suse.de>
Acked-by: David Daney <david.daney@cavium.com>
Reviewed-by: Christoffer Dall <cdall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <cdall@linaro.org>
(backported from commit 40228ba57c8532d4977d684a363915402d85dbf9)
[ dannf: Dropped SYS_ prefix on ICV_DIR_EL1 macro, which wasn't
  added upstream until 0e9884fe ]
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/virt/kvm/arm/hyp/vgic-v3-sr.c b/virt/kvm/arm/hyp/vgic-v3-sr.c
index 86824e99ecb8d4aeae4af4107096fd6591e64900..0351f0a0a49d2e9795ce98ef3bef43a8e3541800 100644 (file)
--- a/virt/kvm/arm/hyp/vgic-v3-sr.c
+++ b/virt/kvm/arm/hyp/vgic-v3-sr.c
@@ -701,6 +701,30 @@ static void __hyp_text __vgic_v3_bump_eoicount(void)
        write_gicreg(hcr, ICH_HCR_EL2);
 }
 
+static void __hyp_text __vgic_v3_write_dir(struct kvm_vcpu *vcpu,
+                                          u32 vmcr, int rt)
+{
+       u32 vid = vcpu_get_reg(vcpu, rt);
+       u64 lr_val;
+       int lr;
+
+       /* EOImode == 0, nothing to be done here */
+       if (!(vmcr & ICH_VMCR_EOIM_MASK))
+               return;
+
+       /* No deactivate to be performed on an LPI */
+       if (vid >= VGIC_MIN_LPI)
+               return;
+
+       lr = __vgic_v3_find_active_lr(vcpu, vid, &lr_val);
+       if (lr == -1) {
+               __vgic_v3_bump_eoicount();
+               return;
+       }
+
+       __vgic_v3_clear_active_lr(lr, lr_val);
+}
+
 static void __hyp_text __vgic_v3_write_eoir(struct kvm_vcpu *vcpu, u32 vmcr, int rt)
 {
        u32 vid = vcpu_get_reg(vcpu, rt);
@@ -995,6 +1019,9 @@ int __hyp_text __vgic_v3_perform_cpuif_access(struct kvm_vcpu *vcpu)
                else
                        fn = __vgic_v3_write_bpr0;
                break;
+       case ICC_DIR_EL1:
+               fn = __vgic_v3_write_dir;
+               break;
        default:
                return 0;
        }