Commit cb8cf4f8 authored by Lorenzo Pieralisi's avatar Lorenzo Pieralisi

ARM: kernel: smp_setup_processor_id() updates

This patch applies some basic changes to the smp_setup_processor_id()
ARM implementation to make the code that builds cpu_logical_map more
uniform across the kernel.

The function now prints the full extent of the boot CPU MPIDR[23:0] and
initializes the cpu_logical_map for CPUs up to nr_cpu_ids.
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
parent 71db5bfe
...@@ -426,13 +426,14 @@ int __cpu_logical_map[NR_CPUS]; ...@@ -426,13 +426,14 @@ int __cpu_logical_map[NR_CPUS];
void __init smp_setup_processor_id(void) void __init smp_setup_processor_id(void)
{ {
int i; int i;
u32 cpu = is_smp() ? read_cpuid_mpidr() & 0xff : 0; u32 mpidr = is_smp() ? read_cpuid_mpidr() & MPIDR_HWID_BITMASK : 0;
u32 cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
cpu_logical_map(0) = cpu; cpu_logical_map(0) = cpu;
for (i = 1; i < NR_CPUS; ++i) for (i = 1; i < nr_cpu_ids; ++i)
cpu_logical_map(i) = i == cpu ? 0 : i; cpu_logical_map(i) = i == cpu ? 0 : i;
printk(KERN_INFO "Booting Linux on physical CPU %d\n", cpu); printk(KERN_INFO "Booting Linux on physical CPU 0x%x\n", mpidr);
} }
static void __init setup_processor(void) static void __init setup_processor(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment