]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
KVM: arm64: vgic-v3: Fix ordering of ICH_HCR_EL2
authorMarc Zyngier <maz@kernel.org>
Fri, 18 Jul 2025 11:11:51 +0000 (12:11 +0100)
committerOliver Upton <oliver.upton@linux.dev>
Sat, 26 Jul 2025 15:36:57 +0000 (08:36 -0700)
The sysreg tables are supposed to be sorted so that a binary search
can easily find them. However, ICH_HCR_EL2 is obviously at the wrong
spot.

Move it where it belongs.

Fixes: 9fe9663e47e21 ("KVM: arm64: Expose GICv3 EL2 registers via KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS")
Signed-off-by: Marc Zyngier <maz@kernel.org>
Reviewed-by: Sebastian Ott <sebott@redhat.com>
Link: https://lore.kernel.org/r/20250718111154.104029-2-maz@kernel.org
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
arch/arm64/kvm/vgic-sys-reg-v3.c

index 75aee0148936fc9692160016fca2f37b7014e122..1850f1727eb935792b4b862a58218f81f497a9d3 100644 (file)
@@ -421,8 +421,8 @@ static const struct sys_reg_desc gic_v3_icc_reg_descs[] = {
        EL2_REG(ICH_AP1R1_EL2, ich_apr),
        EL2_REG(ICH_AP1R2_EL2, ich_apr),
        EL2_REG(ICH_AP1R3_EL2, ich_apr),
-       EL2_REG(ICH_HCR_EL2, ich_reg),
        EL2_REG_RO(ICC_SRE_EL2, icc_sre),
+       EL2_REG(ICH_HCR_EL2, ich_reg),
        EL2_REG_RO(ICH_VTR_EL2, ich_vtr),
        EL2_REG(ICH_VMCR_EL2, ich_reg),
        EL2_REG(ICH_LR0_EL2, ich_reg),