diff options
| author | Robin Getz <rgetz@blackfin.uclinux.org> | 2008-07-26 19:41:40 +0800 |
|---|---|---|
| committer | Bryan Wu <cooloney@kernel.org> | 2008-07-26 19:41:40 +0800 |
| commit | 2d2009806dd843f3adc0cbbb5d2204980f28111a (patch) | |
| tree | 682a1c5ef0136bdd8f31cdb1dad025bb8d5d3791 /arch | |
| parent | 9de3a0b6979a4839d67ca840e386ea06acaabe39 (diff) | |
| download | linux-stable-2d2009806dd843f3adc0cbbb5d2204980f28111a.tar.gz linux-stable-2d2009806dd843f3adc0cbbb5d2204980f28111a.tar.bz2 linux-stable-2d2009806dd843f3adc0cbbb5d2204980f28111a.zip | |
Blackfin arch: If we double fault, rather than hang forever, reset
Signed-off-by: Robin Getz <rgetz@blackfin.uclinux.org>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/blackfin/kernel/setup.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c index c2248fe80588..23e637eb78da 100644 --- a/arch/blackfin/kernel/setup.c +++ b/arch/blackfin/kernel/setup.c @@ -771,6 +771,9 @@ void __init setup_arch(char **cmdline_p) _bfin_swrst = bfin_read_SWRST(); + /* If we double fault, reset the system - otherwise we hang forever */ + bfin_write_SWRST(DOUBLE_FAULT); + if (_bfin_swrst & RESET_DOUBLE) printk(KERN_INFO "Recovering from Double Fault event\n"); else if (_bfin_swrst & RESET_WDOG) @@ -1017,10 +1020,10 @@ static int show_cpuinfo(struct seq_file *m, void *v) } /* Is it turned on? */ - if (bfin_read_DMEM_CONTROL() & (ENDCPLB | DMC_ENABLE) != (ENDCPLB | DMC_ENABLE)) + if ((bfin_read_DMEM_CONTROL() & (ENDCPLB | DMC_ENABLE)) != (ENDCPLB | DMC_ENABLE)) dcache_size = 0; - if (bfin_read_IMEM_CONTROL() & (IMC | ENICPLB) == (IMC | ENICPLB)) + if ((bfin_read_IMEM_CONTROL() & (IMC | ENICPLB)) == (IMC | ENICPLB)) icache_size = 0; seq_printf(m, "cache size\t: %d KB(L1 icache) " |