diff options
author | Robin Getz <robin.getz@analog.com> | 2007-10-29 06:12:15 -0400 |
---|---|---|
committer | Bryan Wu <bryan.wu@analog.com> | 2007-10-29 06:12:15 -0400 |
commit | 7728ec33faf88605fb871b9b0ecf8e45d4359678 (patch) | |
tree | 7d94f5701aa4ca30f26308ec56c41c09c992f569 /arch/blackfin/kernel/setup.c | |
parent | 4ad1ec7154d7e26c1bd82c03c44690ba2b566f2f (diff) |
Blackfin arch: fix bug: tell users if the kernel is recovering from a fault condition
Signed-off-by: Robin Getz <robin.getz@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Diffstat (limited to 'arch/blackfin/kernel/setup.c')
-rw-r--r-- | arch/blackfin/kernel/setup.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c index f1b059e5a06c..fc22ec8c2f47 100644 --- a/arch/blackfin/kernel/setup.c +++ b/arch/blackfin/kernel/setup.c | |||
@@ -316,6 +316,15 @@ void __init setup_arch(char **cmdline_p) | |||
316 | 316 | ||
317 | init_leds(); | 317 | init_leds(); |
318 | 318 | ||
319 | _bfin_swrst = bfin_read_SWRST(); | ||
320 | |||
321 | if (_bfin_swrst & RESET_DOUBLE) | ||
322 | printk(KERN_INFO "Recovering from Double Fault event\n"); | ||
323 | else if (_bfin_swrst & RESET_WDOG) | ||
324 | printk(KERN_INFO "Recovering from Watchdog event\n"); | ||
325 | else if (_bfin_swrst & RESET_SOFTWARE) | ||
326 | printk(KERN_NOTICE "Reset caused by Software reset\n"); | ||
327 | |||
319 | printk(KERN_INFO "Blackfin support (C) 2004-2007 Analog Devices, Inc.\n"); | 328 | printk(KERN_INFO "Blackfin support (C) 2004-2007 Analog Devices, Inc.\n"); |
320 | if (bfin_compiled_revid() == 0xffff) | 329 | if (bfin_compiled_revid() == 0xffff) |
321 | printk(KERN_INFO "Compiled for ADSP-%s Rev any\n", CPU); | 330 | printk(KERN_INFO "Compiled for ADSP-%s Rev any\n", CPU); |
@@ -402,8 +411,6 @@ void __init setup_arch(char **cmdline_p) | |||
402 | if (l1_length > L1_DATA_A_LENGTH) | 411 | if (l1_length > L1_DATA_A_LENGTH) |
403 | panic("L1 data memory overflow\n"); | 412 | panic("L1 data memory overflow\n"); |
404 | 413 | ||
405 | _bfin_swrst = bfin_read_SWRST(); | ||
406 | |||
407 | /* Copy atomic sequences to their fixed location, and sanity check that | 414 | /* Copy atomic sequences to their fixed location, and sanity check that |
408 | these locations are the ones that we advertise to userspace. */ | 415 | these locations are the ones that we advertise to userspace. */ |
409 | memcpy((void *)FIXED_CODE_START, &fixed_code_start, | 416 | memcpy((void *)FIXED_CODE_START, &fixed_code_start, |