Skip to content

Commit 61f2d56

Browse files
Sticklyman1936gregkh
authored andcommitted
KVM: arm64: gic: Set vgic_model before initing private IRQs
[ Upstream commit 9435c1e ] Different GIC types require the private IRQs to be initialised differently. GICv5 is the culprit as it supports both a different number of private IRQs, and all of these are PPIs (there are no SGIs). Moreover, as GICv5 uses the top bits of the interrupt ID to encode the type, the intid also needs to computed differently. Up until now, the GIC model has been set after initialising the private IRQs for a VCPU. Move this earlier to ensure that the GIC model is available when configuring the private IRQs. While we're at it, also move the setting of the in_kernel flag and implementation revision to keep them grouped together as before. Signed-off-by: Sascha Bischoff <sascha.bischoff@arm.com> Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com> Link: https://patch.msgid.link/20260128175919.3828384-7-sascha.bischoff@arm.com Signed-off-by: Marc Zyngier <maz@kernel.org> Stable-dep-of: ac6769c ("KVM: arm64: Eagerly init vgic dist/redist on vgic creation") Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent c384c54 commit 61f2d56

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

arch/arm64/kvm/vgic/vgic-init.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,10 @@ int kvm_vgic_create(struct kvm *kvm, u32 type)
140140
goto out_unlock;
141141
}
142142

143+
kvm->arch.vgic.in_kernel = true;
144+
kvm->arch.vgic.vgic_model = type;
145+
kvm->arch.vgic.implementation_rev = KVM_VGIC_IMP_REV_LATEST;
146+
143147
kvm_for_each_vcpu(i, vcpu, kvm) {
144148
ret = vgic_allocate_private_irqs_locked(vcpu, type);
145149
if (ret)
@@ -156,10 +160,6 @@ int kvm_vgic_create(struct kvm *kvm, u32 type)
156160
goto out_unlock;
157161
}
158162

159-
kvm->arch.vgic.in_kernel = true;
160-
kvm->arch.vgic.vgic_model = type;
161-
kvm->arch.vgic.implementation_rev = KVM_VGIC_IMP_REV_LATEST;
162-
163163
kvm->arch.vgic.vgic_dist_base = VGIC_ADDR_UNDEF;
164164

165165
aa64pfr0 = kvm_read_vm_id_reg(kvm, SYS_ID_AA64PFR0_EL1) & ~ID_AA64PFR0_EL1_GIC;

0 commit comments

Comments
 (0)