Skip to content

Commit b583177

Browse files
Sticklyman1936Marc Zyngier
authored andcommitted
arm64/sysreg: Drop ICH_HFGRTR_EL2.ICC_HAPR_EL1 and make RES1
The GICv5 architecture is dropping the ICC_HAPR_EL1 and ICV_HAPR_EL1 system registers. These registers were never added to the sysregs, but the traps for them were. Drop the trap bit from the ICH_HFGRTR_EL2 and make it Res1 as per the upcoming GICv5 spec change. Additionally, update the EL2 setup code to not attempt to set that bit. Signed-off-by: Sascha Bischoff <sascha.bischoff@arm.com> Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com> Link: https://patch.msgid.link/20260128175919.3828384-4-sascha.bischoff@arm.com Signed-off-by: Marc Zyngier <maz@kernel.org>
1 parent 4a03431 commit b583177

2 files changed

Lines changed: 1 addition & 2 deletions

File tree

arch/arm64/include/asm/el2_setup.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@
225225
ICH_HFGRTR_EL2_ICC_ICSR_EL1 | \
226226
ICH_HFGRTR_EL2_ICC_PCR_EL1 | \
227227
ICH_HFGRTR_EL2_ICC_HPPIR_EL1 | \
228-
ICH_HFGRTR_EL2_ICC_HAPR_EL1 | \
229228
ICH_HFGRTR_EL2_ICC_CR0_EL1 | \
230229
ICH_HFGRTR_EL2_ICC_IDRn_EL1 | \
231230
ICH_HFGRTR_EL2_ICC_APR_EL1)

arch/arm64/tools/sysreg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4579,7 +4579,7 @@ Field 7 ICC_IAFFIDR_EL1
45794579
Field 6 ICC_ICSR_EL1
45804580
Field 5 ICC_PCR_EL1
45814581
Field 4 ICC_HPPIR_EL1
4582-
Field 3 ICC_HAPR_EL1
4582+
Res1 3
45834583
Field 2 ICC_CR0_EL1
45844584
Field 1 ICC_IDRn_EL1
45854585
Field 0 ICC_APR_EL1

0 commit comments

Comments
 (0)