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

Commit 0d98d00b authored by Marc Zyngier's avatar Marc Zyngier
Browse files

arm64: KVM: vgic-v3: Reset LRs at boot time 



In order to let the GICv3 code be more lazy in the way it
accesses the LRs, it is necessary to start with a clean slate.

Let's reset the LRs on each CPU when the vgic is probed (which
includes a round trip to EL2...).

Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 84e8b9c8

arch/arm64/include/asm/kvm_asm.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ extern void __kvm_tlb_flush_vmid(struct kvm *kvm); 
extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu);



extern u64 __vgic_v3_get_ich_vtr_el2(void);

extern void __vgic_v3_init_lrs(void);



extern u32 __kvm_get_mdcr_el2(void);

arch/arm64/kvm/hyp/vgic-v3-sr.c

+9 −0
Original line number Diff line number Diff line
@@ -321,6 +321,15 @@ void __hyp_text __vgic_v3_restore_state(struct kvm_vcpu *vcpu) 
	}

}



void __hyp_text __vgic_v3_init_lrs(void)

{

	int max_lr_idx = vtr_to_max_lr_idx(read_gicreg(ICH_VTR_EL2));

	int i;



	for (i = 0; i <= max_lr_idx; i++)

		__gic_v3_set_lr(0, i);

}



static u64 __hyp_text __vgic_v3_read_ich_vtr_el2(void)

{

	return read_gicreg(ICH_VTR_EL2);

virt/kvm/arm/vgic-v3.c

+7 −0
Original line number Diff line number Diff line
@@ -216,6 +216,11 @@ static const struct vgic_ops vgic_v3_ops = { 


static struct vgic_params vgic_v3_params;



static void vgic_cpu_init_lrs(void *params)

{

	kvm_call_hyp(__vgic_v3_init_lrs);

}



/**

 * vgic_v3_probe - probe for a GICv3 compatible interrupt controller in DT

 * @node:	pointer to the DT node
@@ -284,6 +289,8 @@ int vgic_v3_probe(struct device_node *vgic_node, 
	kvm_info("%s@%llx IRQ%d\n", vgic_node->name,

		 vcpu_res.start, vgic->maint_irq);



	on_each_cpu(vgic_cpu_init_lrs, vgic, 1);



	*ops = &vgic_v3_ops;

	*params = vgic;