brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

PM520: add missing enable_interrupts()

Browse Source 
The code disabled interrupts in several locations, without re-enabling
them again.  Fix this.

While we are at it, also fix a GCC 4.6 build warning:
flash.c: In function 'flash_erase':
flash.c:373:21: warning: variable 'last' set but not used
[-Wunused-but-set-variable]

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Josef Wagner <Wagner@Microsys.de>
This commit is contained in:
Wolfgang Denk 2011-11-04 15:55:16 +00:00
parent 6471ada534
commit 17834a5c63
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
board/pm520/flash.c
View File

@ -370,7 +370,7 @@ static unsigned char intel_sector_protected (flash_info_t *info, ushort sector)
int flash_erase (flash_info_t *info, int s_first, int s_last) int flash_erase (flash_info_t *info, int s_first, int s_last)
{ {
int flag, prot, sect; int flag, prot, sect;
ulong type, start, last; ulong type, start;
int rcode = 0; int rcode = 0;
if ((s_first < 0) || (s_first > s_last)) { if ((s_first < 0) || (s_first > s_last)) {
@ -404,7 +404,6 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
} }
start = get_timer (0); start = get_timer (0);
last = start;
/* Disable interrupts which might cause a timeout here */ /* Disable interrupts which might cause a timeout here */
flag = disable_interrupts (); flag = disable_interrupts ();
@ -440,6 +439,10 @@ int flash_erase (flash_info_t *info, int s_first, int s_last)
printf (" done\n"); printf (" done\n");
} }
} }
if (flag)
enable_interrupts();
return rcode; return rcode;
} }
@ -543,6 +546,7 @@ static int write_data (flash_info_t *info, ulong dest, FPW data)
ulong status; ulong status;
ulong start; ulong start;
int flag; int flag;
int rcode = 0;
/* Check if Flash is (sufficiently) erased */ /* Check if Flash is (sufficiently) erased */
if ((*addr & data) != data) { if ((*addr & data) != data) {
@ -561,14 +565,17 @@ static int write_data (flash_info_t *info, ulong dest, FPW data)
/* wait while polling the status register */ /* wait while polling the status register */
while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080) { while (((status = *addr) & (FPW) 0x00800080) != (FPW) 0x00800080) {
if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) { if (get_timer(start) > CONFIG_SYS_FLASH_WRITE_TOUT) {
*addr = (FPW) 0x00FF00FF; /* restore read mode */ rcode = 1;
return (1); break;
} }
} }
*addr = (FPW) 0x00FF00FF; /* restore read mode */ *addr = (FPW) 0x00FF00FF; /* restore read mode */
return (0); if (flag)
enable_interrupts();
return rcode;
} }
void inline spin_wheel (void) void inline spin_wheel (void)