Skip to content

Commit 87b8cf2

Browse files
Marc Zyngieroupton
authored andcommitted
arm64: cpufeatures: Add missing ID_AA64MMFR4_EL1 to __read_sysreg_by_encoding()
When triggering a CPU hotplug scenario, we reparse the CPU feature with SCOPE_LOCAL_CPU, for which we use __read_sysreg_by_encoding() to get the HW value for this CPU. As it turns out, we're missing the handling for ID_AA64MMFR4_EL1, and trigger a BUG(). Funnily enough, Marek isn't completely happy about that. Add the damn register to the list. Fixes: 805bb61 ("arm64: cpufeature: Add ID_AA64MMFR4_EL1 handling") Reported-by: Marek Szyprowski <[email protected]> Tested-by: Marek Szyprowski <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Oliver Upton <[email protected]>
1 parent aade38f commit 87b8cf2

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

arch/arm64/kernel/cpufeature.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1456,6 +1456,7 @@ u64 __read_sysreg_by_encoding(u32 sys_id)
14561456
read_sysreg_case(SYS_ID_AA64MMFR1_EL1);
14571457
read_sysreg_case(SYS_ID_AA64MMFR2_EL1);
14581458
read_sysreg_case(SYS_ID_AA64MMFR3_EL1);
1459+
read_sysreg_case(SYS_ID_AA64MMFR4_EL1);
14591460
read_sysreg_case(SYS_ID_AA64ISAR0_EL1);
14601461
read_sysreg_case(SYS_ID_AA64ISAR1_EL1);
14611462
read_sysreg_case(SYS_ID_AA64ISAR2_EL1);

0 commit comments

Comments
 (0)