Title: [6708] branches/2009R1/arch/blackfin/kernel/setup.c: Fix bug[#5223] Get bfin_swrst value from SYSCR instead of SWRST only
- Revision
- 6708
- Author
- sonicz
- Date
- 2009-06-15 01:48:42 -0500 (Mon, 15 Jun 2009)
Log Message
Fix bug[#5223] Get bfin_swrst value from SYSCR instead of SWRST only
after double fault failure.
Modified Paths
Diff
Modified: branches/2009R1/arch/blackfin/kernel/setup.c (6707 => 6708)
--- branches/2009R1/arch/blackfin/kernel/setup.c 2009-06-15 04:00:43 UTC (rev 6707)
+++ branches/2009R1/arch/blackfin/kernel/setup.c 2009-06-15 06:48:42 UTC (rev 6708)
@@ -829,13 +829,7 @@
printk(KERN_INFO "Boot Mode: %i\n", bfin_read_SYSCR() & 0xF);
- /* Newer parts mirror SWRST bits in SYSCR */
-#if defined(CONFIG_BF53x) || defined(CONFIG_BF561) || \
- defined(CONFIG_BF538) || defined(CONFIG_BF539)
_bfin_swrst = bfin_read_SWRST();
-#else
- _bfin_swrst = bfin_read_SYSCR();
-#endif
#ifdef CONFIG_DEBUG_DOUBLEFAULT_PRINT
bfin_write_SWRST(_bfin_swrst & ~DOUBLE_FAULT);
@@ -843,7 +837,13 @@
#ifdef CONFIG_DEBUG_DOUBLEFAULT_RESET
bfin_write_SWRST(_bfin_swrst | DOUBLE_FAULT);
#endif
+ /* Newer parts mirror SWRST bits in SYSCR */
+#if !(defined(CONFIG_BF53x) || defined(CONFIG_BF561) || \
+ defined(CONFIG_BF538) || defined(CONFIG_BF539))
+ _bfin_swrst = bfin_read_SYSCR();
+#endif
+
#ifdef CONFIG_SMP
if (_bfin_swrst & SWRST_DBL_FAULT_A) {
#else
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
