On Wed, Nov 21, 2012 at 1:15 PM, Marc Zyngier <marc.zyngier@xxxxxxx> wrote:
> The number of list registers is unlikely to change between vcpu
> creation - it is a property of the hardware.
>
> Just compute it once at init time, and use this value later on
> when creating vcpus.
>
> Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx>
> ---
> arch/arm/kvm/vgic.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/kvm/vgic.c b/arch/arm/kvm/vgic.c
> index dc2f611..d89607a 100644
> --- a/arch/arm/kvm/vgic.c
> +++ b/arch/arm/kvm/vgic.c
> @@ -93,6 +93,7 @@ static void vgic_kick_vcpus(struct kvm *kvm);
> static void vgic_dispatch_sgi(struct kvm_vcpu *vcpu, u32 reg);
>
> static u32 default_vmcr;
> +static u32 default_nr_lr;
>
> static inline int vgic_irq_is_edge(struct vgic_dist *dist, int irq)
> {
> @@ -1051,7 +1052,6 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)
> {
> struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
> struct vgic_dist *dist = &vcpu->kvm->arch.vgic;
> - u32 reg;
> int i;
>
> if (!irqchip_in_kernel(vcpu->kvm))
> @@ -1071,12 +1071,8 @@ int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu)
> vgic_cpu->vgic_irq_lr_map[i] = LR_EMPTY;
> }
>
> - BUG_ON(!vcpu->kvm->arch.vgic.vctrl_base);
> - reg = readl_relaxed(vcpu->kvm->arch.vgic.vctrl_base + GICH_VTR);
> - vgic_cpu->nr_lr = (reg & 0x1f) + 1;
> -
> vgic_cpu->vgic_vmcr = default_vmcr;
> -
> + vgic_cpu->nr_lr = default_nr_lr;
> vgic_cpu->vgic_hcr = VGIC_HCR_EN; /* Get the show on the road... */
>
> return 0;
> @@ -1124,6 +1120,9 @@ int kvm_vgic_hyp_init(void)
> goto out_free_irq;
> }
>
> + default_nr_lr = readl_relaxed(vgic_vctrl_base + GICH_VTR);
> + default_nr_lr = (default_nr_lr & 0x1f) + 1;
> +
> default_vmcr = readl_relaxed(vgic_vctrl_base + GICH_VMCR);
> default_vmcr |= (0x1f << 27); /* Priority */
> default_vmcr &= ~0x21f; /* Clear VEM, VMCPBR, VMFIQEn, VMAckCtl, VMGrp1En, VMGrp0En */
> --
> 1.7.12
>
>
I agree with Peter's comment, otherwise looks good, thanks.
-Christoffer
_______________________________________________
kvmarm mailing list
kvmarm@xxxxxxxxxxxxxxxxxxxxx
https://lists.cs.columbia.edu/cucslists/listinfo/kvmarm
