KVM: arm64: vgic-v3: Enable trapping of Group-0 system registers

[mirror_ubuntu-zesty-kernel.git] / virt / kvm / arm / vgic / vgic-v3.c

diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c
index 6fd6cbd70b8ca4b7c7dc8e391d7695f3674f4e68..9b6e1f58d6259196b78f64e2a1e54a49185a3766 100644 (file)
--- a/virt/kvm/arm/vgic/vgic-v3.c
+++ b/virt/kvm/arm/vgic/vgic-v3.c
@@ -60,6 +60,7 @@ void vgic_v3_process_maintenance(struct kvm_vcpu *vcpu)
        cpuif->vgic_hcr &= ~ICH_HCR_UIE;
 }
 
+static bool group0_trap;
 static bool group1_trap;
 
 void vgic_v3_set_underflow(struct kvm_vcpu *vcpu)
@@ -228,6 +229,8 @@ void vgic_v3_enable(struct kvm_vcpu *vcpu)
 
        /* Get the show on the road... */
        vgic_v3->vgic_hcr = ICH_HCR_EN;
+       if (group0_trap)
+               vgic_v3->vgic_hcr |= ICH_HCR_TALL0;
        if (group1_trap)
                vgic_v3->vgic_hcr |= ICH_HCR_TALL1;
 }
@@ -367,7 +370,7 @@ int vgic_v3_probe(const struct gic_kvm_info *info)
        if (kvm_vgic_global_state.vcpu_base == 0)
                kvm_info("disabling GICv2 emulation\n");
 
-       if (group1_trap) {
+       if (group0_trap || group1_trap) {
                kvm_info("GICv3 sysreg trapping enabled (reduced performance)\n");
                static_branch_enable(&vgic_v3_cpuif_trap);
        }