Skip to content

Commit 4a7fe84

Browse files
author
Marc Zyngier
committed
arm64: Repaint ID_AA64MMFR2_EL1.IDS description
ID_AA64MMFR2_EL1.IDS, as described in the sysreg file, is pretty horrible as it diesctly give the ESR value. Repaint it using the usual NI/IMP identifiers to describe the absence/presence of FEAT_IDST. Also add the new EL3 routing feature, even if we really don't care about it. Reviewed-by: Joey Gouly <joey.gouly@arm.com> Link: https://patch.msgid.link/20260108173233.2911955-2-maz@kernel.org Signed-off-by: Marc Zyngier <maz@kernel.org>
1 parent f8f9c1f commit 4a7fe84

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

arch/arm64/kvm/hyp/nvhe/sys_regs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ static const struct pvm_ftr_bits pvmid_aa64mmfr2[] = {
134134
MAX_FEAT(ID_AA64MMFR2_EL1, UAO, IMP),
135135
MAX_FEAT(ID_AA64MMFR2_EL1, IESB, IMP),
136136
MAX_FEAT(ID_AA64MMFR2_EL1, AT, IMP),
137-
MAX_FEAT_ENUM(ID_AA64MMFR2_EL1, IDS, 0x18),
137+
MAX_FEAT(ID_AA64MMFR2_EL1, IDS, IMP),
138138
MAX_FEAT(ID_AA64MMFR2_EL1, TTL, IMP),
139139
MAX_FEAT(ID_AA64MMFR2_EL1, BBM, 2),
140140
MAX_FEAT(ID_AA64MMFR2_EL1, E0PD, IMP),

arch/arm64/tools/sysreg

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2256,9 +2256,10 @@ UnsignedEnum 43:40 FWB
22562256
0b0000 NI
22572257
0b0001 IMP
22582258
EndEnum
2259-
Enum 39:36 IDS
2260-
0b0000 0x0
2261-
0b0001 0x18
2259+
UnsignedEnum 39:36 IDS
2260+
0b0000 NI
2261+
0b0001 IMP
2262+
0b0010 EL3
22622263
EndEnum
22632264
UnsignedEnum 35:32 AT
22642265
0b0000 NI

0 commit comments

Comments
 (0)