diff options
| author |   Marc Zyngier <maz@kernel.org> | 2020-03-24 12:45:27 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-03-24 12:45:27 +0000 |
| commit | cc98702c1775a9ff3d943674c97d9561cf605fcd (patch) | |
| tree | fbc3f129b173e6f31343cb73a9fb4d79754f0d4c /virt/kvm/arm/vgic/vgic-v3.c | |
| parent | KVM: arm64: Use the correct timer structure to access the physical counter (diff) | |
| parent | KVM: arm64: GICv4.1: Expose HW-based SGIs in debugfs (diff) | |
| download | linux-dev-cc98702c1775a9ff3d943674c97d9561cf605fcd.tar.xz linux-dev-cc98702c1775a9ff3d943674c97d9561cf605fcd.zip | |
Merge branch 'kvm-arm64/gic-v4.1' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'virt/kvm/arm/vgic/vgic-v3.c')
| -rw-r--r-- | virt/kvm/arm/vgic/vgic-v3.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c index f45635a6f0ec..2c9fc13e2c59 100644 --- a/virt/kvm/arm/vgic/vgic-v3.c +++ b/virt/kvm/arm/vgic/vgic-v3.c @@ -540,6 +540,8 @@ int vgic_v3_map_resources(struct kvm *kvm) goto out; } + if (kvm_vgic_global_state.has_gicv4_1) + vgic_v4_configure_vsgis(kvm); dist->ready = true; out: @@ -595,7 +597,9 @@ int vgic_v3_probe(const struct gic_kvm_info *info) /* GICv4 support? */ if (info->has_v4) { kvm_vgic_global_state.has_gicv4 = gicv4_enable; - kvm_info("GICv4 support %sabled\n", + kvm_vgic_global_state.has_gicv4_1 = info->has_v4_1 && gicv4_enable; + kvm_info("GICv4%s support %sabled\n", + kvm_vgic_global_state.has_gicv4_1 ? ".1" : "", gicv4_enable ? "en" : "dis"); } |