KVM: ARM: vgic: revisit implementation of irqchip_in_kernel (f982cf4e) · Commits · 戴 / test

So far, irqchip_in_kernel() was implemented by testing the value of vctrl_base, which worked fine with GICv2. With GICv3, this field is useless, as we're using system registers instead of a emmory mapped interface. To solve this, add a boolean flag indicating if the we're using a vgic or not. Reviewed-by:

Christoffer Dall <christoffer.dall@linaro.org> Signed-off-by:

Marc Zyngier <marc.zyngier@arm.com>

include/kvm/arm_vgic.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -117,6 +117,7 @@ struct vgic_params {
		struct vgic_dist {
		#ifdef CONFIG_KVM_ARM_VGIC
		spinlock_t lock;
		bool in_kernel;
		bool ready;

		/* Virtual control interface mapping */
		@@ -212,7 +213,7 @@ int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu);
		bool vgic_handle_mmio(struct kvm_vcpu vcpu, struct kvm_run run,
		struct kvm_exit_mmio *mmio);

		#define irqchip_in_kernel(k) (!!((k)->arch.vgic.vctrl_base))
		#define irqchip_in_kernel(k) (!!((k)->arch.vgic.in_kernel))
		#define vgic_initialized(k) ((k)->arch.vgic.ready)

		int vgic_v2_probe(struct device_node *vgic_node,

virt/kvm/arm/vgic.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1650,6 +1650,7 @@ int kvm_vgic_create(struct kvm *kvm)
		}

		spin_lock_init(&kvm->arch.vgic.lock);
		kvm->arch.vgic.in_kernel = true;
		kvm->arch.vgic.vctrl_base = vgic->vctrl_base;
		kvm->arch.vgic.vgic_dist_base = VGIC_ADDR_UNDEF;
		kvm->arch.vgic.vgic_cpu_base = VGIC_ADDR_UNDEF;

Admin message