Skip to contentSkip to conversation

arm64/sme: Add ID_AA64SMFR0_EL1 to __read_sysreg_by_encoding()

PATCH Applied Mark Brown 3 participants 3 messages Apr 27, 2022 arm64

lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 arm64/sme: Add ID_AA64SMFR0_EL1 to __read_sysreg_by_encoding()

We need to explicitly enumerate all the ID registers which we rely on for CPU capabilities in __read_sysreg_by_encoding(), ID_AA64SMFR0_EL1 was missed from this list so we trip a BUG() in paths which rely on that function such as CPU hotplug. Add the register.

---
 arch/arm64/kernel/cpufeature.c | 1 +
 1 file changed, 1 insertion(+)
arch/arm64/kernel/cpufeature.c +1 -0
index 082b3f48cbfd..619324b8bcef 100644
@@ -1336,6 +1336,7 @@ u64 __read_sysreg_by_encoding(u32 sys_id)
 	read_sysreg_case(SYS_ID_AA64PFR0_EL1);
 	read_sysreg_case(SYS_ID_AA64PFR1_EL1);
 	read_sysreg_case(SYS_ID_AA64ZFR0_EL1);
+	read_sysreg_case(SYS_ID_AA64SMFR0_EL1);
 	read_sysreg_case(SYS_ID_AA64DFR0_EL1);
 	read_sysreg_case(SYS_ID_AA64DFR1_EL1);
 	read_sysreg_case(SYS_ID_AA64MMFR0_EL1);
Signature · 7 lines
2.30.2


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Tested-by on v1 1/1
#1 lore raw
Quoted 7 lines · Mark Brown

We need to explicitly enumerate all the ID registers which we rely on for CPU capabilities in __read_sysreg_by_encoding(), ID_AA64SMFR0_EL1 was missed from this list so we trip a BUG() in paths which rely on that function such as CPU hotplug. Add the register.

Quoted 9 lines
---
  arch/arm64/kernel/cpufeature.c | 1 +
  1 file changed, 1 insertion(+)
arch/arm64/kernel/cpufeature.c +0 -0
index 082b3f48cbfd..619324b8bcef 100644

arch/arm64/kernel/cpufeature.c u64 __read_sysreg_by_encoding(u32 sys_id) · line 1342

Quoted 7 lines
arch/arm64/kernel/cpufeature.c +1 -0
@@ -1336,6 +1336,7 @@ u64 __read_sysreg_by_encoding(u32 sys_id)
  	read_sysreg_case(SYS_ID_AA64PFR0_EL1);
  	read_sysreg_case(SYS_ID_AA64PFR1_EL1);
  	read_sysreg_case(SYS_ID_AA64ZFR0_EL1);
+	read_sysreg_case(SYS_ID_AA64SMFR0_EL1);
  	read_sysreg_case(SYS_ID_AA64DFR0_EL1);
  	read_sysreg_case(SYS_ID_AA64DFR1_EL1);
  	read_sysreg_case(SYS_ID_AA64MMFR0_EL1);

Best regards

Signature · 8 lines
Marek Szyprowski, PhD
Samsung R&D Institute Poland


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
maintainer Applied
#2 lore raw
In reply to Mark Brown
Quoted 6 lines · Mark Brown

We need to explicitly enumerate all the ID registers which we rely on for CPU capabilities in __read_sysreg_by_encoding(), ID_AA64SMFR0_EL1 was missed from this list so we trip a BUG() in paths which rely on that function such as CPU hotplug. Add the register.

Applied to arm64 (for-next/sme), thanks!

[1/1] arm64/sme: Add ID_AA64SMFR0_EL1 to __read_sysreg_by_encoding()

      https://git.kernel.org/arm64/c/8a58bcd00e2e
Signature · 7 lines
Catalin


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel