aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Getz <robin.getz@analog.com>2009-06-10 06:11:21 +0000
committerMike Frysinger <vapier@gentoo.org>2009-06-13 07:20:10 -0400
commit54ebae7166275a618f0228138e67ff7d10a3b9d0 (patch)
tree403fc7decea11e2e15367b241a22c5f071a925c2
parent86f2008bf546af9a434f480710e8d33891616bf5 (diff)
downloadkernel_samsung_smdk4412-54ebae7166275a618f0228138e67ff7d10a3b9d0.zip
kernel_samsung_smdk4412-54ebae7166275a618f0228138e67ff7d10a3b9d0.tar.gz
kernel_samsung_smdk4412-54ebae7166275a618f0228138e67ff7d10a3b9d0.tar.bz2
Blackfin: do not configure the UART early if on wrong processor
Before we configure the early UART, check to make sure we are running on the expected processor - otherwise, we cause problems by configuring pins that don't exist (and causing an infinite loop of faults). Signed-off-by: Robin Getz <robin.getz@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--arch/blackfin/kernel/early_printk.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/early_printk.c b/arch/blackfin/kernel/early_printk.c
index 3302719..2ab5681 100644
--- a/arch/blackfin/kernel/early_printk.c
+++ b/arch/blackfin/kernel/early_printk.c
@@ -202,11 +202,15 @@ asmlinkage void __init init_early_exception_vectors(void)
asmlinkage void __init early_trap_c(struct pt_regs *fp, void *retaddr)
{
/* This can happen before the uart is initialized, so initialize
- * the UART now
+ * the UART now (but only if we are running on the processor we think
+ * we are compiled for - otherwise we write to MMRs that don't exist,
+ * and cause other problems. Nothing comes out the UART, but it does
+ * end up in the __buf_log.
*/
- if (likely(early_console == NULL))
+ if (likely(early_console == NULL) && CPUID == bfin_cpuid())
setup_early_printk(DEFAULT_EARLY_PORT);
+ printk(KERN_EMERG "Early panic\n");
dump_bfin_mem(fp);
show_regs(fp);
dump_bfin_trace_buffer();