]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
KVM: arm64: Fix writeable mask for ID_AA64PFR2_EL1
authorMarc Zyngier <maz@kernel.org>
Wed, 1 Apr 2026 10:35:59 +0000 (11:35 +0100)
committerMarc Zyngier <maz@kernel.org>
Wed, 1 Apr 2026 14:42:26 +0000 (15:42 +0100)
The writeable mask for fields in ID_AA64PFR2_EL1 has been accidentally
inverted, which isn't a very good idea.

Restore the expected polarity.

Reviewed-by: Sascha Bischoff <sascha.bischoff@arm.com>
Fixes: a258a383b9177 ("KVM: arm64: gic-v5: Sanitize ID_AA64PFR2_EL1.GCIE")
Link: https://sashiko.dev/#/patchset/20260319154937.3619520-1-sascha.bischoff%40arm.com
Link: https://patch.msgid.link/20260401103611.357092-5-maz@kernel.org
Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/kvm/sys_regs.c

index 18e2d2fccedb8356cd73b54196b56bbf392fa1b8..6a96cb7ba9a3c735fefe9635021a0c206d5299c0 100644 (file)
@@ -3304,10 +3304,10 @@ static const struct sys_reg_desc sys_reg_descs[] = {
                                       ID_AA64PFR1_EL1_MPAM_frac |
                                       ID_AA64PFR1_EL1_MTE)),
        ID_FILTERED(ID_AA64PFR2_EL1, id_aa64pfr2_el1,
-                   ~(ID_AA64PFR2_EL1_FPMR |
-                     ID_AA64PFR2_EL1_MTEFAR |
-                     ID_AA64PFR2_EL1_MTESTOREONLY |
-                     ID_AA64PFR2_EL1_GCIE)),
+                   (ID_AA64PFR2_EL1_FPMR               |
+                    ID_AA64PFR2_EL1_MTEFAR             |
+                    ID_AA64PFR2_EL1_MTESTOREONLY       |
+                    ID_AA64PFR2_EL1_GCIE)),
        ID_UNALLOCATED(4,3),
        ID_WRITABLE(ID_AA64ZFR0_EL1, ~ID_AA64ZFR0_EL1_RES0),
        ID_HIDDEN(ID_AA64SMFR0_EL1),