summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Getz <robin.getz@analog.com>2009-12-21 16:59:21 -0500
committerMike Frysinger <vapier@gentoo.org>2010-01-17 09:17:27 -0500
commitb6db2834407d49ec48ac8e9281fdd704d5ee3eba (patch)
treea6e6de41825251d5dfd69d7144f385f5b6ab3f7d
parent0097870e3d72f10ec58ae22488945fd9ee37289f (diff)
downloadu-boot-imx-b6db2834407d49ec48ac8e9281fdd704d5ee3eba.zip
u-boot-imx-b6db2834407d49ec48ac8e9281fdd704d5ee3eba.tar.gz
u-boot-imx-b6db2834407d49ec48ac8e9281fdd704d5ee3eba.tar.bz2
Blackfin: keep hwtrace on CPLB miss
Crashes rarely happen in the CPLB miss handler compared to the rest of U-Boot code, so disable hardware tracing when processing misses. This way a crash due to other functions will be shown properly. Signed-off-by: Robin Getz <robin.getz@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--cpu/blackfin/traps.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/cpu/blackfin/traps.c b/cpu/blackfin/traps.c
index 7e7c74c..becc36e 100644
--- a/cpu/blackfin/traps.c
+++ b/cpu/blackfin/traps.c
@@ -100,6 +100,14 @@ void trap_c(struct pt_regs *regs)
uint32_t new_cplb_addr = 0, new_cplb_data = 0;
static size_t last_evicted;
size_t i;
+ unsigned long tflags;
+
+ /*
+ * Keep the trace buffer so that a miss here points people
+ * to the right place (their code). Crashes here rarely
+ * happen. If they do, only the Blackfin maintainer cares.
+ */
+ trace_buffer_save(tflags);
new_cplb_addr = (data ? bfin_read_DCPLB_FAULT_ADDR() : bfin_read_ICPLB_FAULT_ADDR()) & ~(4 * 1024 * 1024 - 1);
@@ -156,6 +164,7 @@ void trap_c(struct pt_regs *regs)
for (i = 0; i < 16; ++i)
debug("%2i 0x%p 0x%08X\n", i, *CPLB_ADDR++, *CPLB_DATA++);
+ trace_buffer_restore(tflags);
break;
}