aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2012-05-05 15:58:13 -0400
committerLuis Henriques <luis.henriques@canonical.com>2012-05-25 12:24:43 -0400
commit974b602be4e0cec127258aecda078e8180173274 (patch)
treeea8c17e96d48663aa9da1238adf01616964efd7d
parent90998890adc94f023c18675855ba9de05df3d70c (diff)
ARM: 7414/1: SMP: prevent use of the console when using idmap_pgd
BugLink: http://bugs.launchpad.net/bugs/1002880 commit fde165b2a29673aabf18ceff14dea1f1cfb0daad upstream. Commit 4e8ee7de227e3ab9a72040b448ad728c5428a042 (ARM: SMP: use idmap_pgd for mapping MMU enable during secondary booting) switched secondary boot to use idmap_pgd, which is initialized during early_initcall, instead of a page table initialized during __cpu_up. This causes idmap_pgd to contain the static mappings but be missing all dynamic mappings. If a console is registered that creates a dynamic mapping, the printk in secondary_start_kernel will trigger a data abort on the missing mapping before the exception handlers have been initialized, leading to a hang. Initial boot is not affected because no consoles have been registered, and resume is usually not affected because the offending console is suspended. Onlining a cpu with hotplug triggers the problem. A workaround is to the printk in secondary_start_kernel until after the page tables have been switched back to init_mm. Signed-off-by: Colin Cross <ccross@android.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
-rw-r--r--arch/arm/kernel/smp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index e7f92a4321f..fea97f64221 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -279,8 +279,6 @@ asmlinkage void __cpuinit secondary_start_kernel(void)
279 struct mm_struct *mm = &init_mm; 279 struct mm_struct *mm = &init_mm;
280 unsigned int cpu = smp_processor_id(); 280 unsigned int cpu = smp_processor_id();
281 281
282 printk("CPU%u: Booted secondary processor\n", cpu);
283
284 /* 282 /*
285 * All kernel threads share the same mm context; grab a 283 * All kernel threads share the same mm context; grab a
286 * reference and switch to it. 284 * reference and switch to it.
@@ -292,6 +290,8 @@ asmlinkage void __cpuinit secondary_start_kernel(void)
292 enter_lazy_tlb(mm, current); 290 enter_lazy_tlb(mm, current);
293 local_flush_tlb_all(); 291 local_flush_tlb_all();
294 292
293 printk("CPU%u: Booted secondary processor\n", cpu);
294
295 cpu_init(); 295 cpu_init();
296 preempt_disable(); 296 preempt_disable();
297 trace_hardirqs_off(); 297 trace_hardirqs_off();