]> git.baikalelectronics.ru Git - kernel.git/commit
KVM: arm64: arch_timer: Remove VGIC initialization check
authorAlexandru Elisei <alexandru.elisei@arm.com>
Tue, 1 Dec 2020 15:01:54 +0000 (15:01 +0000)
committerMarc Zyngier <maz@kernel.org>
Wed, 23 Dec 2020 16:43:12 +0000 (16:43 +0000)
commitaa73bd45bd693dde251d05557b87ed673da508df
tree3d2e69ff6108736477f7e4f769243ee175956497
parentd404c20bcb4b0f3941d130d566c7c203322e5798
KVM: arm64: arch_timer: Remove VGIC initialization check

kvm_timer_enable() is called in kvm_vcpu_first_run_init() after
kvm_vgic_map_resources() if the VGIC wasn't ready. kvm_vgic_map_resources()
is the only place where kvm->arch.vgic.ready is set to true.

For a v2 VGIC, kvm_vgic_map_resources() will attempt to initialize the VGIC
and set the initialized flag.

For a v3 VGIC, kvm_vgic_map_resources() will return an error code if the
VGIC isn't already initialized.

The end result is that if we've reached kvm_timer_enable(), the VGIC is
initialzed and ready and vgic_initialized() will always be true, so remove
this check.

Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
[maz: added comment about vgic initialisation, as suggested by Eric]
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20201201150157.223625-3-alexandru.elisei@arm.com
arch/arm64/kvm/arch_timer.c