tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Robin Getz and committed by
Bryan Wu 2d200980 9de3a0b6

+5 -2
unified split
+5 -2
arch/blackfin/kernel/setup.c
··· 771 771 772 772 _bfin_swrst = bfin_read_SWRST(); 773 773 774 + /* If we double fault, reset the system - otherwise we hang forever */ 775 + bfin_write_SWRST(DOUBLE_FAULT); 776 + 774 777 if (_bfin_swrst & RESET_DOUBLE) 775 778 printk(KERN_INFO "Recovering from Double Fault event\n"); 776 779 else if (_bfin_swrst & RESET_WDOG) ··· 1020 1017 } 1021 1018 1022 1019 /* Is it turned on? */ 1023 - if (bfin_read_DMEM_CONTROL() & (ENDCPLB | DMC_ENABLE) != (ENDCPLB | DMC_ENABLE)) 1020 + if ((bfin_read_DMEM_CONTROL() & (ENDCPLB | DMC_ENABLE)) != (ENDCPLB | DMC_ENABLE)) 1024 1021 dcache_size = 0; 1025 1022 1026 - if (bfin_read_IMEM_CONTROL() & (IMC | ENICPLB) == (IMC | ENICPLB)) 1023 + if ((bfin_read_IMEM_CONTROL() & (IMC | ENICPLB)) == (IMC | ENICPLB)) 1027 1024 icache_size = 0; 1028 1025 1029 1026 seq_printf(m, "cache size\t: %d KB(L1 icache) "