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

Commit 9cbb6d96 authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

ARM: KVM: fix L2CTLR to be per-cluster 



The L2CTLR register contains the number of CPUs in this cluster.

Make sure the register content is actually relevant to the vcpu
that is being configured by computing the number of cores that are
part of its cluster.

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

arch/arm/kvm/coproc.c

+4 −0
Original line number Diff line number Diff line
@@ -124,6 +124,10 @@ static void reset_l2ctlr(struct kvm_vcpu *vcpu, const struct coproc_reg *r) 
	asm volatile("mrc p15, 1, %0, c9, c0, 2\n" : "=r" (l2ctlr));

	l2ctlr &= ~(3 << 24);

	ncores = atomic_read(&vcpu->kvm->online_vcpus) - 1;

	/* How many cores in the current cluster and the next ones */

	ncores -= (vcpu->vcpu_id & ~3);

	/* Cap it to the maximum number of cores in a single cluster */

	ncores = min(ncores, 3U);

	l2ctlr |= (ncores & 3) << 24;



	vcpu->arch.cp15[c9_L2CTLR] = l2ctlr;