Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

KVM: arm64: gic-v5: Probe for GICv5

Add in a probe function for GICv5 which enables support for GICv3
guests on a GICv5 host, if FEAT_GCIE_LEGACY is supported by the
hardware.

Co-authored-by: Timothy Hayes <timothy.hayes@arm.com>
Signed-off-by: Timothy Hayes <timothy.hayes@arm.com>
Signed-off-by: Sascha Bischoff <sascha.bischoff@arm.com>
Link: https://lore.kernel.org/r/20250627100847.1022515-6-sascha.bischoff@arm.com
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>

authored by

Sascha Bischoff
Timothy Hayes
and committed by
Oliver Upton
ff2aa649 c017e49e

+59 -1
+2 -1
arch/arm64/kvm/Makefile
··· 23 23 vgic/vgic-v3.o vgic/vgic-v4.o \ 24 24 vgic/vgic-mmio.o vgic/vgic-mmio-v2.o \ 25 25 vgic/vgic-mmio-v3.o vgic/vgic-kvm-device.o \ 26 - vgic/vgic-its.o vgic/vgic-debug.o vgic/vgic-v3-nested.o 26 + vgic/vgic-its.o vgic/vgic-debug.o vgic/vgic-v3-nested.o \ 27 + vgic/vgic-v5.o 27 28 28 29 kvm-$(CONFIG_HW_PERF_EVENTS) += pmu-emul.o pmu.o 29 30 kvm-$(CONFIG_ARM64_PTR_AUTH) += pauth.o
+3
arch/arm64/kvm/vgic/vgic-init.c
··· 724 724 kvm_info("GIC system register CPU interface enabled\n"); 725 725 } 726 726 break; 727 + case GIC_V5: 728 + ret = vgic_v5_probe(gic_kvm_info); 729 + break; 727 730 default: 728 731 ret = -ENODEV; 729 732 }
+52
arch/arm64/kvm/vgic/vgic-v5.c
··· 1 + // SPDX-License-Identifier: GPL-2.0-only 2 + 3 + #include <kvm/arm_vgic.h> 4 + #include <linux/irqchip/arm-vgic-info.h> 5 + 6 + #include "vgic.h" 7 + 8 + /* 9 + * Probe for a vGICv5 compatible interrupt controller, returning 0 on success. 10 + * Currently only supports GICv3-based VMs on a GICv5 host, and hence only 11 + * registers a VGIC_V3 device. 12 + */ 13 + int vgic_v5_probe(const struct gic_kvm_info *info) 14 + { 15 + u64 ich_vtr_el2; 16 + int ret; 17 + 18 + if (!info->has_gcie_v3_compat) 19 + return -ENODEV; 20 + 21 + kvm_vgic_global_state.type = VGIC_V5; 22 + kvm_vgic_global_state.has_gcie_v3_compat = true; 23 + 24 + /* We only support v3 compat mode - use vGICv3 limits */ 25 + kvm_vgic_global_state.max_gic_vcpus = VGIC_V3_MAX_CPUS; 26 + 27 + kvm_vgic_global_state.vcpu_base = 0; 28 + kvm_vgic_global_state.vctrl_base = NULL; 29 + kvm_vgic_global_state.can_emulate_gicv2 = false; 30 + kvm_vgic_global_state.has_gicv4 = false; 31 + kvm_vgic_global_state.has_gicv4_1 = false; 32 + 33 + ich_vtr_el2 = kvm_call_hyp_ret(__vgic_v3_get_gic_config); 34 + kvm_vgic_global_state.ich_vtr_el2 = (u32)ich_vtr_el2; 35 + 36 + /* 37 + * The ListRegs field is 5 bits, but there is an architectural 38 + * maximum of 16 list registers. Just ignore bit 4... 39 + */ 40 + kvm_vgic_global_state.nr_lr = (ich_vtr_el2 & 0xf) + 1; 41 + 42 + ret = kvm_register_vgic_device(KVM_DEV_TYPE_ARM_VGIC_V3); 43 + if (ret) { 44 + kvm_err("Cannot register GICv3-legacy KVM device.\n"); 45 + return ret; 46 + } 47 + 48 + static_branch_enable(&kvm_vgic_global_state.gicv3_cpuif); 49 + kvm_info("GCIE legacy system register CPU interface\n"); 50 + 51 + return 0; 52 + }
+2
arch/arm64/kvm/vgic/vgic.h
··· 308 308 void vgic_debug_init(struct kvm *kvm); 309 309 void vgic_debug_destroy(struct kvm *kvm); 310 310 311 + int vgic_v5_probe(const struct gic_kvm_info *info); 312 + 311 313 static inline int vgic_v3_max_apr_idx(struct kvm_vcpu *vcpu) 312 314 { 313 315 struct vgic_cpu *cpu_if = &vcpu->arch.vgic_cpu;