]> git.baikalelectronics.ru Git - kernel.git/commit
KVM: arm64: vgic-v3: Consistently populate ID_AA64PFR0_EL1.GIC
authorMarc Zyngier <maz@kernel.org>
Tue, 3 May 2022 21:14:24 +0000 (22:14 +0100)
committerMarc Zyngier <maz@kernel.org>
Sun, 15 May 2022 11:12:14 +0000 (12:12 +0100)
commit94d76ee3ed334d8872c891d1d50524de33ceffd7
tree3c8d32deb4cbf1adf2fe46ec55e8fce1bac3bcad
parent09fea895e5536b134dc85239fb18ba54c93ae1c0
KVM: arm64: vgic-v3: Consistently populate ID_AA64PFR0_EL1.GIC

When adding support for the slightly wonky Apple M1, we had to
populate ID_AA64PFR0_EL1.GIC==1 to present something to the guest,
as the HW itself doesn't advertise the feature.

However, we gated this on the in-kernel irqchip being created.
This causes some trouble for QEMU, which snapshots the state of
the registers before creating a virtual GIC, and then tries to
restore these registers once the GIC has been created.  Obviously,
between the two stages, ID_AA64PFR0_EL1.GIC has changed value,
and the write fails.

The fix is to actually emulate the HW, and always populate the
field if the HW is capable of it.

Fixes: 671321327171 ("KVM: arm64: Force ID_AA64PFR0_EL1.GIC=1 when exposing a virtual GICv3")
Cc: stable@vger.kernel.org
Signed-off-by: Marc Zyngier <maz@kernel.org>
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Oliver Upton <oupton@google.com>
Link: https://lore.kernel.org/r/20220503211424.3375263-1-maz@kernel.org
arch/arm64/kvm/sys_regs.c