path: root/arch/arm/kernel/devtree.c
diff options
authorSudeep Holla <sudeep.holla@arm.com>2014-01-08 18:24:21 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-01-11 12:06:57 +0000
commite44ef891e9e68b6ce7d3fd3bac73b7d5433050ae (patch)
treed2e402f9a80bdf8f6739c6853b32d59b79713fb9 /arch/arm/kernel/devtree.c
parent6bcac805bacb3b637911244d95368512ae389abc (diff)
ARM: 7934/1: DT/kernel: fix arch_match_cpu_phys_id to avoid erroneous match
The MPIDR contains specific bitfields(MPIDR.Aff{2..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. As such it is not necessary to mask the phys_id with MPIDR_HWID_BITMASK, and doing so could lead to matching erroneous CPU nodes in the device tree. This patch removes the masking of the physical identifier. Acked-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/devtree.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index 739c3dfc1da2..34d5fd585bbb 100644
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -171,7 +171,7 @@ void __init arm_dt_init_cpu_maps(void)
bool arch_match_cpu_phys_id(int cpu, u64 phys_id)
- return (phys_id & MPIDR_HWID_BITMASK) == cpu_logical_map(cpu);
+ return phys_id == cpu_logical_map(cpu);
static const void * __init arch_get_next_mach(const char *const **match)