diff options
authorSudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>2013-10-21 13:29:42 +0100
committerMark Brown <broonie@linaro.org>2013-12-13 12:27:35 +0000
commit5066e800ba3438724f7541c284d674acd9909ba6 (patch)
parent914866357990d96231a6bb8d2cad870cf21bd44a (diff)
ARM64: DT: define ARM64 specific arch_match_cpu_phys_idv3.10/topic/arm64-cpu
OF/DT core library provides architecture specific hook to match the logical cpu index with the corresponding physical identifier. On ARM64, the MPIDR_EL1 contains specific bitfields(MPIDR_EL1.Aff{3..0}) which uniquely identify a CPU, in addition to some non-identifying information and reserved bits. The ARM cpu binding defines the 'reg' property to only contain the affinity bits, and any cpu nodes with other bits set in their 'reg' entry are skipped. This patch overrides the weak definition of arch_match_cpu_phys_id with ARM64 specific version using MPIDR_EL1.Aff{3..0} as cpu physical identifiers. Signed-off-by: Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com> Acked-by: Mark Rutland <mark.rutland@arm.com> Cc: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> (cherry picked from commit 6e15d0e04bfeaa5662a289ee915273307326e45a)
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 3dc5c2f..85afdae 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -98,6 +98,11 @@ void __init early_print(const char *str, ...)
printk("%s", buf);
+bool arch_match_cpu_phys_id(int cpu, u64 phys_id)
+ return phys_id == cpu_logical_map(cpu);
static void __init setup_processor(void)
struct cpu_info *cpu_info;