[PATCH v3 12/19] KVM: ARM: vgic: introduce vgic_enable

[Christoffer Dall]

On Wed, Apr 16, 2014 at 02:39:44PM +0100, Marc Zyngier wrote:
> Move the code dealing with kicking the VGIC on to vgic_ops.

Kicking the VGIC?  Enabling it?

> 
> Acked-by: Catalin Marinas <catalin.marinas at arm.com>
> Signed-off-by: Marc Zyngier <marc.zyngier at arm.com>
> ---
>  include/kvm/arm_vgic.h |  1 +
>  virt/kvm/arm/vgic.c    | 29 +++++++++++++++++++++--------
>  2 files changed, 22 insertions(+), 8 deletions(-)
> 
> diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
> index 0017253..58a938f 100644
> --- a/include/kvm/arm_vgic.h
> +++ b/include/kvm/arm_vgic.h
> @@ -98,6 +98,7 @@ struct vgic_ops {
>  	void	(*clear_underflow)(struct kvm_vcpu *vcpu);
>  	void	(*get_vmcr)(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr);
>  	void	(*set_vmcr)(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr);
> +	void	(*enable)(struct kvm_vcpu *vcpu);
>  };
>  
>  struct vgic_dist {
> diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
> index 574ca47..a6d70fc 100644
> --- a/virt/kvm/arm/vgic.c
> +++ b/virt/kvm/arm/vgic.c
> @@ -1081,6 +1081,19 @@ static void vgic_v2_set_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcrp)
>  	vcpu->arch.vgic_cpu.vgic_v2.vgic_vmcr = vmcr;
>  }
>  
> +static void vgic_v2_enable(struct kvm_vcpu *vcpu)
> +{
> +	/*
> +	 * By forcing VMCR to zero, the GIC will restore the binary
> +	 * points to their reset values. Anything else resets to zero
> +	 * anyway.
> +	 */
> +	vcpu->arch.vgic_cpu.vgic_v2.vgic_vmcr = 0;
> +
> +	/* Get the show on the road... */
> +	vcpu->arch.vgic_cpu.vgic_v2.vgic_hcr = GICH_HCR_EN;
> +}
> +
>  static const struct vgic_ops vgic_ops = {
>  	.get_lr			= vgic_v2_get_lr,
>  	.set_lr			= vgic_v2_set_lr,
> @@ -1091,6 +1104,7 @@ static const struct vgic_ops vgic_ops = {
>  	.clear_underflow	= vgic_v2_clear_underflow,
>  	.get_vmcr		= vgic_v2_get_vmcr,
>  	.set_vmcr		= vgic_v2_set_vmcr,
> +	.enable			= vgic_v2_enable,
>  };
>  
>  static inline struct vgic_lr vgic_get_lr(const struct kvm_vcpu *vcpu, int lr)
> @@ -1139,6 +1153,11 @@ static void vgic_set_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr)
>  	vgic_ops.set_vmcr(vcpu, vmcr);
>  }
>  
> +static inline void vgic_enable(struct kvm_vcpu *vcpu)
> +{
> +	vgic_ops.enable(vcpu);
> +}
> +
>  static void vgic_retire_lr(int lr_nr, int irq, struct kvm_vcpu *vcpu)
>  {
>  	struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
> @@ -1593,15 +1612,9 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)
>  		vgic_cpu->vgic_irq_lr_map[i] = LR_EMPTY;
>  	}
>  
> -	/*
> -	 * By forcing VMCR to zero, the GIC will restore the binary
> -	 * points to their reset values. Anything else resets to zero
> -	 * anyway.
> -	 */
> -	vgic_cpu->vgic_v2.vgic_vmcr = 0;
> -
>  	vgic_cpu->nr_lr = vgic_nr_lr;
> -	vgic_cpu->vgic_v2.vgic_hcr = GICH_HCR_EN; /* Get the show on the road... */
> +
> +	vgic_enable(vcpu);
>  
>  	return 0;
>  }
> -- 
> 1.8.3.4
> 

Reviewed-by: Christoffer Dall <christoffer.dall at linaro.org>