Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c52edf5f authored by Christoffer Dall's avatar Christoffer Dall
Browse files

arm/arm64: KVM: Rename vgic_initialized to vgic_ready 



The vgic_initialized() macro currently returns the state of the
vgic->ready flag, which indicates if the vgic is ready to be used when
running a VM, not specifically if its internal state has been
initialized.

Rename the macro accordingly in preparation for a more nuanced
initialization flow.

Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Reviewed-by: default avatarEric Auger <eric.auger@linaro.org>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 6d3cfbe2

arch/arm/kvm/arm.c

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu) 
	 * Map the VGIC hardware resources before running a vcpu the first

	 * time on this VM.

	 */

	if (unlikely(!vgic_initialized(vcpu->kvm))) {

	if (unlikely(!vgic_ready(vcpu->kvm))) {

		ret = kvm_vgic_map_resources(vcpu->kvm);

		if (ret)

			return ret;

include/kvm/arm_vgic.h

+2 −2
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ 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.in_kernel))

#define vgic_initialized(k)	((k)->arch.vgic.ready)

#define vgic_ready(k)		((k)->arch.vgic.ready)



int vgic_v2_probe(struct device_node *vgic_node,

		  const struct vgic_ops **ops,
@@ -369,7 +369,7 @@ static inline int irqchip_in_kernel(struct kvm *kvm) 
	return 0;

}



static inline bool vgic_initialized(struct kvm *kvm)

static inline bool vgic_ready(struct kvm *kvm)

{

	return true;

}

virt/kvm/arm/vgic.c

+3 −3
Original line number Diff line number Diff line
@@ -1696,7 +1696,7 @@ int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid, unsigned int irq_num, 
{

	int vcpu_id;



	if (likely(vgic_initialized(kvm))) {

	if (likely(vgic_ready(kvm))) {

		vcpu_id = vgic_update_irq_pending(kvm, cpuid, irq_num, level);

		if (vcpu_id >= 0)

			/* kick the specified vcpu */
@@ -1888,7 +1888,7 @@ int kvm_vgic_map_resources(struct kvm *kvm) 


	mutex_lock(&kvm->lock);



	if (vgic_initialized(kvm))

	if (vgic_ready(kvm))

		goto out;



	if (IS_VGIC_ADDR_UNDEF(kvm->arch.vgic.vgic_dist_base) ||
@@ -2282,7 +2282,7 @@ static int vgic_set_attr(struct kvm_device *dev, struct kvm_device_attr *attr) 


		mutex_lock(&dev->kvm->lock);



		if (vgic_initialized(dev->kvm) || dev->kvm->arch.vgic.nr_irqs)

		if (vgic_ready(dev->kvm) || dev->kvm->arch.vgic.nr_irqs)

			ret = -EBUSY;

		else

			dev->kvm->arch.vgic.nr_irqs = val;