Commit ea2f83a7 authored by Andre Przywara's avatar Andre Przywara Committed by Christoffer Dall
Browse files

arm/arm64: KVM: move kvm_register_device_ops() into vGIC probing 



Currently we unconditionally register the GICv2 emulation device
during the host's KVM initialization. Since with GICv3 support we
may end up with only v2 or only v3 or both supported, we move the
registration into the GIC probing function, where we will later know
which combination is valid.

Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
Acked-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent b26e5fda

include/linux/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -1051,6 +1051,7 @@ void kvm_unregister_device_ops(u32 type); 


extern struct kvm_device_ops kvm_mpic_ops;

extern struct kvm_device_ops kvm_xics_ops;

extern struct kvm_device_ops kvm_arm_vgic_v2_ops;



#ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT

virt/kvm/arm/vgic-v2.c

+2 −0
Original line number Diff line number Diff line
@@ -229,6 +229,8 @@ int vgic_v2_probe(struct device_node *vgic_node, 
		goto out_unmap;

	}



	kvm_register_device_ops(&kvm_arm_vgic_v2_ops, KVM_DEV_TYPE_ARM_VGIC_V2);



	vgic->vcpu_base = vcpu_res.start;



	kvm_info("%s@%llx IRQ%d\n", vgic_node->name,

virt/kvm/arm/vgic-v3.c

+1 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ int vgic_v3_probe(struct device_node *vgic_node, 
		ret = -ENXIO;

		goto out;

	}

	kvm_register_device_ops(&kvm_arm_vgic_v2_ops, KVM_DEV_TYPE_ARM_VGIC_V2);



	vgic->vcpu_base = vcpu_res.start;

	vgic->vctrl_base = NULL;

virt/kvm/arm/vgic.c

+2 −3
Original line number Diff line number Diff line
@@ -2564,7 +2564,7 @@ static int vgic_create(struct kvm_device *dev, u32 type) 
	return kvm_vgic_create(dev->kvm, type);

}



static struct kvm_device_ops kvm_arm_vgic_v2_ops = {

struct kvm_device_ops kvm_arm_vgic_v2_ops = {

	.name = "kvm-arm-vgic",

	.create = vgic_create,

	.destroy = vgic_destroy,
@@ -2643,8 +2643,7 @@ int kvm_vgic_hyp_init(void) 


	on_each_cpu(vgic_init_maintenance_interrupt, NULL, 1);



	return kvm_register_device_ops(&kvm_arm_vgic_v2_ops,

				       KVM_DEV_TYPE_ARM_VGIC_V2);

	return 0;



out_free_irq:

	free_percpu_irq(vgic->maint_irq, kvm_get_running_vcpus());

CRA Git | Maintained and supported by SUSTech CRA and CCSE