]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
KVM: arm64: Correctly plumb ID_AA64PFR2_EL1 into pkvm idreg handling
authorMarc Zyngier <maz@kernel.org>
Wed, 1 Apr 2026 10:36:09 +0000 (11:36 +0100)
committerMarc Zyngier <maz@kernel.org>
Wed, 1 Apr 2026 14:42:26 +0000 (15:42 +0100)
While we now compute ID_AA64PFR2_EL1 to a glorious 0, we never use
that data and instead return the 0 that corresponds to an allocated
idreg. Not a big deal, but we might as well be consistent.

Reviewed-by: Sascha Bischoff <sascha.bischoff@arm.com>
Fixes: 5aefaf11f9af5 ("KVM: arm64: gic: Hide GICv5 for protected guests")
Link: https://sashiko.dev/#/patchset/20260319154937.3619520-1-sascha.bischoff%40arm.com
Link: https://patch.msgid.link/20260401103611.357092-15-maz@kernel.org
Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/kvm/hyp/nvhe/sys_regs.c

index b40fd01ebf32941ad2b026a5329b1f4ca41799ba..be6f420388a14378f315eaaca56696489feab2d1 100644 (file)
@@ -439,7 +439,7 @@ static const struct sys_reg_desc pvm_sys_reg_descs[] = {
        /* CRm=4 */
        AARCH64(SYS_ID_AA64PFR0_EL1),
        AARCH64(SYS_ID_AA64PFR1_EL1),
-       ID_UNALLOCATED(4,2),
+       AARCH64(SYS_ID_AA64PFR2_EL1),
        ID_UNALLOCATED(4,3),
        AARCH64(SYS_ID_AA64ZFR0_EL1),
        ID_UNALLOCATED(4,5),