lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Blackfin arch: sync reboot handler with version in u-boot

Browse Source 
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
This commit is contained in:
Mike Frysinger
2009-02-04 16:49:45 +08:00
committed by Bryan Wu
parent aa9c33b496
commit adab7eb883
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
arch/blackfin/kernel/reboot.c
View File

@@ -20,7 +20,7 @@
* reset while the Core B bit (on dual core parts) is cleared by * reset while the Core B bit (on dual core parts) is cleared by
* the core reset. * the core reset.
*/ */
__attribute__((l1_text)) __attribute__ ((__l1_text__, __noreturn__))
static void _bfin_reset(void) static void _bfin_reset(void)
{ {
/* Wait for completion of "system" events such as cache line /* Wait for completion of "system" events such as cache line
@@ -30,7 +30,11 @@ static void _bfin_reset(void)
*/ */
__builtin_bfin_ssync(); __builtin_bfin_ssync();
while (1) { /* The bootrom checks to see how it was reset and will
* automatically perform a software reset for us when
* it starts executing after the core reset.
*/
if (ANOMALY_05000353 || ANOMALY_05000386) {
/* Initiate System software reset. */ /* Initiate System software reset. */
bfin_write_SWRST(0x7); bfin_write_SWRST(0x7);
@@ -50,6 +54,11 @@ static void _bfin_reset(void)
/* Clear System software reset */ /* Clear System software reset */
bfin_write_SWRST(0); bfin_write_SWRST(0);
/* The BF526 ROM will crash during reset */
#if defined(__ADSPBF522__) || defined(__ADSPBF524__) || defined(__ADSPBF526__)
bfin_read_SWRST();
#endif
/* Wait for the SWRST write to complete. Cannot rely on SSYNC /* Wait for the SWRST write to complete. Cannot rely on SSYNC
* though as the System state is all reset now. * though as the System state is all reset now.
*/ */
@@ -60,22 +69,17 @@ static void _bfin_reset(void)
: "a" (15 * 1) : "a" (15 * 1)
: "LC1", "LB1", "LT1" : "LC1", "LB1", "LT1"
); );
}
while (1)
/* Issue core reset */ /* Issue core reset */
asm("raise 1"); asm("raise 1");
}
} }
__attribute__ ((__noreturn__))
static void bfin_reset(void) static void bfin_reset(void)
{ {
if (ANOMALY_05000353 || ANOMALY_05000386) _bfin_reset();
_bfin_reset();
else
/* the bootrom checks to see how it was reset and will
* automatically perform a software reset for us when
* it starts executing boot
*/
asm("raise 1;");
} }
__attribute__((weak)) __attribute__((weak))