aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuzuki K. Poulose <suzuki.poulose@arm.com>2015-10-19 09:24:47 -0400
committerCatalin Marinas <catalin.marinas@arm.com>2015-10-21 10:35:56 -0400
commitb3f1537893b54d0f42f52e0f4cde5e17e21f564c (patch)
tree7099fece1301fdee963f52cf406027b3aab433e0
parent3086d391f992984def0aa6aa4a36f54853c58536 (diff)
arm64: Read system wide CPUID value
Add an API for reading the safe CPUID value across the system from the new infrastructure. Signed-off-by: Suzuki K. Poulose <suzuki.poulose@arm.com> Tested-by: Dave Martin <Dave.Martin@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-rw-r--r--arch/arm64/include/asm/cpufeature.h2
-rw-r--r--arch/arm64/kernel/cpufeature.c9
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h
index 01bb5cf995af..81217220eb92 100644
--- a/arch/arm64/include/asm/cpufeature.h
+++ b/arch/arm64/include/asm/cpufeature.h
@@ -144,6 +144,8 @@ void check_local_cpu_features(void);
144bool cpu_supports_mixed_endian_el0(void); 144bool cpu_supports_mixed_endian_el0(void);
145bool system_supports_mixed_endian_el0(void); 145bool system_supports_mixed_endian_el0(void);
146 146
147u64 read_system_reg(u32 id);
148
147#endif /* __ASSEMBLY__ */ 149#endif /* __ASSEMBLY__ */
148 150
149#endif 151#endif
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index aae181760e1f..b4656cabf87f 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -590,6 +590,15 @@ void update_cpu_features(int cpu,
590 update_mixed_endian_el0_support(info); 590 update_mixed_endian_el0_support(info);
591} 591}
592 592
593u64 read_system_reg(u32 id)
594{
595 struct arm64_ftr_reg *regp = get_arm64_ftr_reg(id);
596
597 /* We shouldn't get a request for an unsupported register */
598 BUG_ON(!regp);
599 return regp->sys_val;
600}
601
593static bool 602static bool
594feature_matches(u64 reg, const struct arm64_cpu_capabilities *entry) 603feature_matches(u64 reg, const struct arm64_cpu_capabilities *entry)
595{ 604{