Skip to content

U
U-Boot.Mirror

OS / U-Boot.Mirror

通知 1
Star 0
Fork 0
U
U-Boot.Mirror

体验新版 GitCode，发现更多精彩内容 >>

提交 be60a902 编写于 作者: H Haavard Skinnemoen 提交者： Stefan Roese
浏览文件
操作

cfi_flash: Reorder functions and eliminate extra prototypes 

Reorder the functions in cfi_flash.c so that each function only uses
functions that have been defined before it. This allows the static
prototype declarations near the top to be eliminated and might allow
gcc to do a better job inlining functions.
Signed-off-by: NHaavard Skinnemoen <hskinnemoen@atmel.com>
上级 3055793b
隐藏空白更改
内联 并排
Showing with 933 addition and 964 deletion
drivers/mtd/cfi_flash.c
浏览文件 @ be60a902
...@@ -176,37 +176,25 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* FLASH chips info */ ...@@ -176,37 +176,25 @@ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* FLASH chips info */
#define CFG_FLASH_CFI_WIDTH FLASH_CFI_8BIT #define CFG_FLASH_CFI_WIDTH FLASH_CFI_8BIT
#endif #endif
typedef unsigned long flash_sect_t;
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Functions
*/ */
#if defined(CFG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
static flash_info_t *flash_get_info(ulong base)
{
int i;
flash_info_t * info = 0;
typedef unsigned long flash_sect_t; for (i = 0; i < CFG_MAX_FLASH_BANKS; i++) {
info = & flash_info[i];
if (info->size && info->start[0] <= base &&
base <= info->start[0] + info->size - 1)
break;
}
static void flash_add_byte (flash_info_t * info, cfiword_t * cword, uchar c); return i == CFG_MAX_FLASH_BANKS ? 0 : info;
static void flash_make_cmd (flash_info_t * info, uchar cmd, void *cmdbuf); }
static void flash_write_cmd (flash_info_t * info, flash_sect_t sect,
uint offset, uchar cmd);
static void flash_unlock_seq (flash_info_t * info, flash_sect_t sect);
static int flash_isequal (flash_info_t * info, flash_sect_t sect,
uint offset, uchar cmd);
static int flash_isset (flash_info_t * info, flash_sect_t sect,
uint offset, uchar cmd);
static int flash_toggle (flash_info_t * info, flash_sect_t sect,
uint offset, uchar cmd);
static void flash_read_jedec_ids (flash_info_t * info);
static int flash_detect_cfi (flash_info_t * info);
static int flash_write_cfiword (flash_info_t * info, ulong dest,
cfiword_t cword);
static int flash_full_status_check (flash_info_t * info, flash_sect_t sector,
ulong tout, char *prompt);
ulong flash_get_size (ulong base, int banknum);
#if defined(CFG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
static flash_info_t *flash_get_info(ulong base);
#endif
#ifdef CFG_FLASH_USE_BUFFER_WRITE
static int flash_write_cfibuffer (flash_info_t * info, ulong dest,
uchar * cp, int len);
#endif #endif
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
...@@ -218,6 +206,22 @@ flash_make_addr (flash_info_t * info, flash_sect_t sect, uint offset) ...@@ -218,6 +206,22 @@ flash_make_addr (flash_info_t * info, flash_sect_t sect, uint offset)
return ((uchar *) (info->start[sect] + (offset * info->portwidth))); return ((uchar *) (info->start[sect] + (offset * info->portwidth)));
} }
/*-----------------------------------------------------------------------
* make a proper sized command based on the port and chip widths
*/
static void flash_make_cmd (flash_info_t * info, uchar cmd, void *cmdbuf)
{
int i;
uchar *cp = (uchar *) cmdbuf;
#if defined(__LITTLE_ENDIAN) || defined(CFG_WRITE_SWAPPED_DATA)
for (i = info->portwidth; i > 0; i--)
#else
for (i = 1; i <= info->portwidth; i++)
#endif
*cp++ = (i & (info->chipwidth - 1)) ? '\0' : cmd;
}
#ifdef DEBUG #ifdef DEBUG
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Debug support * Debug support
...@@ -231,6 +235,7 @@ static void print_longlong (char *str, unsigned long long data) ...@@ -231,6 +235,7 @@ static void print_longlong (char *str, unsigned long long data)
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
sprintf (&str[i * 2], "%2.2x", *cp++); sprintf (&str[i * 2], "%2.2x", *cp++);
} }
static void flash_printqry (flash_info_t * info, flash_sect_t sect) static void flash_printqry (flash_info_t * info, flash_sect_t sect)
{ {
cfiptr_t cptr; cfiptr_t cptr;
...@@ -340,870 +345,873 @@ static ulong flash_read_long (flash_info_t * info, flash_sect_t sect, ...@@ -340,870 +345,873 @@ static ulong flash_read_long (flash_info_t * info, flash_sect_t sect,
return retval; return retval;
} }
/*
#ifdef CONFIG_FLASH_CFI_LEGACY * Write a proper sized command to the correct address
/*-----------------------------------------------------------------------
* Call board code to request info about non-CFI flash.
* board_flash_get_legacy needs to fill in at least:
* info->portwidth, info->chipwidth and info->interface for Jedec probing.
*/ */
static int flash_detect_legacy(ulong base, int banknum) static void flash_write_cmd (flash_info_t * info, flash_sect_t sect,
uint offset, uchar cmd)
{ {
flash_info_t *info = &flash_info[banknum];
if (board_flash_get_legacy(base, banknum, info)) { volatile cfiptr_t addr;
/* board code may have filled info completely. If not, we cfiword_t cword;
use JEDEC ID probing. */
if (!info->vendor) {
int modes[] = {
CFI_CMDSET_AMD_STANDARD,
CFI_CMDSET_INTEL_STANDARD
};
int i;
for (i = 0; i < sizeof(modes) / sizeof(modes[0]); i++) { addr.cp = flash_make_addr (info, sect, offset);
info->vendor = modes[i]; flash_make_cmd (info, cmd, &cword);
info->start[0] = base; switch (info->portwidth) {
if (info->portwidth == FLASH_CFI_8BIT case FLASH_CFI_8BIT:
&& info->interface == FLASH_CFI_X8X16) { debug ("fwc addr %p cmd %x %x 8bit x %d bit\n", addr.cp, cmd,
info->addr_unlock1 = 0x2AAA; cword.c, info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
info->addr_unlock2 = 0x5555; *addr.cp = cword.c;
} else { break;
info->addr_unlock1 = 0x5555; case FLASH_CFI_16BIT:
info->addr_unlock2 = 0x2AAA; debug ("fwc addr %p cmd %x %4.4x 16bit x %d bit\n", addr.wp,
} cmd, cword.w,
flash_read_jedec_ids(info); info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
debug("JEDEC PROBE: ID %x %x %x\n", *addr.wp = cword.w;
info->manufacturer_id, break;
info->device_id, case FLASH_CFI_32BIT:
info->device_id2); debug ("fwc addr %p cmd %x %8.8lx 32bit x %d bit\n", addr.lp,
if (jedec_flash_match(info, base)) cmd, cword.l,
break; info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
} *addr.lp = cword.l;
} break;
case FLASH_CFI_64BIT:
#ifdef DEBUG
{
char str[20];
switch(info->vendor) { print_longlong (str, cword.ll);
case CFI_CMDSET_INTEL_STANDARD:
case CFI_CMDSET_INTEL_EXTENDED: debug ("fwrite addr %p cmd %x %s 64 bit x %d bit\n",
info->cmd_reset = FLASH_CMD_RESET; addr.llp, cmd, str,
break; info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
case CFI_CMDSET_AMD_STANDARD:
case CFI_CMDSET_AMD_EXTENDED:
case CFI_CMDSET_AMD_LEGACY:
info->cmd_reset = AMD_CMD_RESET;
break;
} }
info->flash_id = FLASH_MAN_CFI; #endif
return 1; *addr.llp = cword.ll;
break;
} }
return 0; /* use CFI */
/* Ensure all the instructions are fully finished */
sync();
} }
#else
static inline int flash_detect_legacy(ulong base, int banknum) static void flash_unlock_seq (flash_info_t * info, flash_sect_t sect)
{ {
return 0; /* use CFI */ flash_write_cmd (info, sect, info->addr_unlock1, AMD_CMD_UNLOCK_START);
flash_write_cmd (info, sect, info->addr_unlock2, AMD_CMD_UNLOCK_ACK);
} }
#endif
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
*/ */
unsigned long flash_init (void) static int flash_isequal (flash_info_t * info, flash_sect_t sect,
uint offset, uchar cmd)
{ {
unsigned long size = 0; cfiptr_t cptr;
int i; cfiword_t cword;
int retval;
#ifdef CFG_FLASH_PROTECTION cptr.cp = flash_make_addr (info, sect, offset);
char *s = getenv("unlock"); flash_make_cmd (info, cmd, &cword);
#endif
/* Init: no FLASHes known */ debug ("is= cmd %x(%c) addr %p ", cmd, cmd, cptr.cp);
for (i = 0; i < CFG_MAX_FLASH_BANKS; ++i) { switch (info->portwidth) {
flash_info[i].flash_id = FLASH_UNKNOWN; case FLASH_CFI_8BIT:
debug ("is= %x %x\n", cptr.cp[0], cword.c);
retval = (cptr.cp[0] == cword.c);
break;
case FLASH_CFI_16BIT:
debug ("is= %4.4x %4.4x\n", cptr.wp[0], cword.w);
retval = (cptr.wp[0] == cword.w);
break;
case FLASH_CFI_32BIT:
debug ("is= %8.8lx %8.8lx\n", cptr.lp[0], cword.l);
retval = (cptr.lp[0] == cword.l);
break;
case FLASH_CFI_64BIT:
#ifdef DEBUG
{
char str1[20];
char str2[20];
if (!flash_detect_legacy (bank_base[i], i)) print_longlong (str1, cptr.llp[0]);
flash_get_size (bank_base[i], i); print_longlong (str2, cword.ll);
size += flash_info[i].size; debug ("is= %s %s\n", str1, str2);
if (flash_info[i].flash_id == FLASH_UNKNOWN) {
#ifndef CFG_FLASH_QUIET_TEST
printf ("## Unknown FLASH on Bank %d "
"- Size = 0x%08lx = %ld MB\n",
i+1, flash_info[i].size,
flash_info[i].size << 20);
#endif /* CFG_FLASH_QUIET_TEST */
} }
#ifdef CFG_FLASH_PROTECTION #endif
else if ((s != NULL) && (strcmp(s, "yes") == 0)) { retval = (cptr.llp[0] == cword.ll);
/* break;
* Only the U-Boot image and it's environment default:
* is protected, all other sectors are retval = 0;
* unprotected (unlocked) if flash hardware break;
* protection is used (CFG_FLASH_PROTECTION) }
* and the environment variable "unlock" is return retval;
* set to "yes". }
*/
if (flash_info[i].legacy_unlock) {
int k;
/*
* Disable legacy_unlock temporarily,
* since flash_real_protect would
* relock all other sectors again
* otherwise.
*/
flash_info[i].legacy_unlock = 0;
/* /*-----------------------------------------------------------------------
* Legacy unlocking (e.g. Intel J3) -> */
* unlock only one sector. This will static int flash_isset (flash_info_t * info, flash_sect_t sect,
* unlock all sectors. uint offset, uchar cmd)
*/ {
flash_real_protect (&flash_info[i], 0, 0); cfiptr_t cptr;
cfiword_t cword;
int retval;
flash_info[i].legacy_unlock = 1; cptr.cp = flash_make_addr (info, sect, offset);
flash_make_cmd (info, cmd, &cword);
switch (info->portwidth) {
case FLASH_CFI_8BIT:
retval = ((cptr.cp[0] & cword.c) == cword.c);
break;
case FLASH_CFI_16BIT:
retval = ((cptr.wp[0] & cword.w) == cword.w);
break;
case FLASH_CFI_32BIT:
retval = ((cptr.lp[0] & cword.l) == cword.l);
break;
case FLASH_CFI_64BIT:
retval = ((cptr.llp[0] & cword.ll) == cword.ll);
break;
default:
retval = 0;
break;
}
return retval;
}
/* /*-----------------------------------------------------------------------
* Manually mark other sectors as */
* unlocked (unprotected) static int flash_toggle (flash_info_t * info, flash_sect_t sect,
*/ uint offset, uchar cmd)
for (k = 1; k < flash_info[i].sector_count; k++) {
flash_info[i].protect[k] = 0; cfiptr_t cptr;
} else { cfiword_t cword;
/* int retval;
* No legancy unlocking -> unlock all sectors
*/
flash_protect (FLAG_PROTECT_CLEAR,
flash_info[i].start[0],
flash_info[i].start[0]
+ flash_info[i].size - 1,
&flash_info[i]);
}
}
#endif /* CFG_FLASH_PROTECTION */
}
/* Monitor protection ON by default */
#if (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
flash_protect (FLAG_PROTECT_SET,
CFG_MONITOR_BASE,
CFG_MONITOR_BASE + monitor_flash_len - 1,
flash_get_info(CFG_MONITOR_BASE));
#endif
/* Environment protection ON by default */
#ifdef CFG_ENV_IS_IN_FLASH
flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
flash_get_info(CFG_ENV_ADDR));
#endif
/* Redundant environment protection ON by default */ cptr.cp = flash_make_addr (info, sect, offset);
#ifdef CFG_ENV_ADDR_REDUND flash_make_cmd (info, cmd, &cword);
flash_protect (FLAG_PROTECT_SET, switch (info->portwidth) {
CFG_ENV_ADDR_REDUND, case FLASH_CFI_8BIT:
CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1, retval = ((cptr.cp[0] & cword.c) != (cptr.cp[0] & cword.c));
flash_get_info(CFG_ENV_ADDR_REDUND)); break;
#endif case FLASH_CFI_16BIT:
return (size); retval = ((cptr.wp[0] & cword.w) != (cptr.wp[0] & cword.w));
break;
case FLASH_CFI_32BIT:
retval = ((cptr.lp[0] & cword.l) != (cptr.lp[0] & cword.l));
break;
case FLASH_CFI_64BIT:
retval = ((cptr.llp[0] & cword.ll) !=
(cptr.llp[0] & cword.ll));
break;
default:
retval = 0;
break;
}
return retval;
} }
/*----------------------------------------------------------------------- /*
* flash_is_busy - check to see if the flash is busy
*
* This routine checks the status of the chip and returns true if the
* chip is busy.
*/ */
#if defined(CFG_ENV_IS_IN_FLASH) || defined(CFG_ENV_ADDR_REDUND) || (CFG_MONITOR_BASE >= CFG_FLASH_BASE) static int flash_is_busy (flash_info_t * info, flash_sect_t sect)
static flash_info_t *flash_get_info(ulong base)
{ {
int i; int retval;
flash_info_t * info = 0;
for (i = 0; i < CFG_MAX_FLASH_BANKS; i++) { switch (info->vendor) {
info = & flash_info[i]; case CFI_CMDSET_INTEL_STANDARD:
if (info->size && info->start[0] <= base && case CFI_CMDSET_INTEL_EXTENDED:
base <= info->start[0] + info->size - 1) retval = !flash_isset (info, sect, 0, FLASH_STATUS_DONE);
break; break;
case CFI_CMDSET_AMD_STANDARD:
case CFI_CMDSET_AMD_EXTENDED:
#ifdef CONFIG_FLASH_CFI_LEGACY
case CFI_CMDSET_AMD_LEGACY:
#endif
retval = flash_toggle (info, sect, 0, AMD_STATUS_TOGGLE);
break;
default:
retval = 0;
} }
debug ("flash_is_busy: %d\n", retval);
return i == CFG_MAX_FLASH_BANKS ? 0 : info; return retval;
} }
#endif
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* wait for XSR.7 to be set. Time out with an error if it does not.
* This routine does not set the flash to read-array mode.
*/ */
int flash_erase (flash_info_t * info, int s_first, int s_last) static int flash_status_check (flash_info_t * info, flash_sect_t sector,
ulong tout, char *prompt)
{ {
int rcode = 0; ulong start;
int prot;
flash_sect_t sect;
if (info->flash_id != FLASH_MAN_CFI) { #if CFG_HZ != 1000
puts ("Can't erase unknown flash type - aborted\n"); tout *= CFG_HZ/1000;
return 1; #endif
}
if ((s_first < 0) || (s_first > s_last)) {
puts ("- no sectors to erase\n");
return 1;
}
prot = 0; /* Wait for command completion */
for (sect = s_first; sect <= s_last; ++sect) { start = get_timer (0);
if (info->protect[sect]) { while (flash_is_busy (info, sector)) {
prot++; if (get_timer (start) > tout) {
printf ("Flash %s timeout at address %lx data %lx\n",
prompt, info->start[sector],
flash_read_long (info, sector, 0));
flash_write_cmd (info, sector, 0, info->cmd_reset);
return ERR_TIMOUT;
} }
udelay (1); /* also triggers watchdog */
} }
if (prot) { return ERR_OK;
printf ("- Warning: %d protected sectors will not be erased!\n", }
prot);
} else {
putc ('\n');
}
/*-----------------------------------------------------------------------
* Wait for XSR.7 to be set, if it times out print an error, otherwise
* do a full status check.
*
* This routine sets the flash to read-array mode.
*/
static int flash_full_status_check (flash_info_t * info, flash_sect_t sector,
ulong tout, char *prompt)
{
int retcode;
for (sect = s_first; sect <= s_last; sect++) { retcode = flash_status_check (info, sector, tout, prompt);
if (info->protect[sect] == 0) { /* not protected */ switch (info->vendor) {
switch (info->vendor) { case CFI_CMDSET_INTEL_EXTENDED:
case CFI_CMDSET_INTEL_STANDARD: case CFI_CMDSET_INTEL_STANDARD:
case CFI_CMDSET_INTEL_EXTENDED: if ((retcode == ERR_OK)
flash_write_cmd (info, sect, 0, && !flash_isequal (info, sector, 0, FLASH_STATUS_DONE)) {
FLASH_CMD_CLEAR_STATUS); retcode = ERR_INVAL;
flash_write_cmd (info, sect, 0, printf ("Flash %s error at address %lx\n", prompt,
FLASH_CMD_BLOCK_ERASE); info->start[sector]);
flash_write_cmd (info, sect, 0, if (flash_isset (info, sector, 0, FLASH_STATUS_ECLBS |
FLASH_CMD_ERASE_CONFIRM); FLASH_STATUS_PSLBS)) {
break; puts ("Command Sequence Error.\n");
case CFI_CMDSET_AMD_STANDARD: } else if (flash_isset (info, sector, 0,
case CFI_CMDSET_AMD_EXTENDED: FLASH_STATUS_ECLBS)) {
flash_unlock_seq (info, sect); puts ("Block Erase Error.\n");
flash_write_cmd (info, sect, retcode = ERR_NOT_ERASED;
info->addr_unlock1, } else if (flash_isset (info, sector, 0,
AMD_CMD_ERASE_START); FLASH_STATUS_PSLBS)) {
flash_unlock_seq (info, sect); puts ("Locking Error\n");
flash_write_cmd (info, sect, 0,
AMD_CMD_ERASE_SECTOR);
break;
#ifdef CONFIG_FLASH_CFI_LEGACY
case CFI_CMDSET_AMD_LEGACY:
flash_unlock_seq (info, 0);
flash_write_cmd (info, 0, info->addr_unlock1,
AMD_CMD_ERASE_START);
flash_unlock_seq (info, 0);
flash_write_cmd (info, sect, 0,
AMD_CMD_ERASE_SECTOR);
break;
#endif
default:
debug ("Unkown flash vendor %d\n",
info->vendor);
break;
} }
if (flash_isset (info, sector, 0, FLASH_STATUS_DPS)) {
if (flash_full_status_check puts ("Block locked.\n");
(info, sect, info->erase_blk_tout, "erase")) { retcode = ERR_PROTECTED;
rcode = 1; }
} else if (flash_isset (info, sector, 0, FLASH_STATUS_VPENS))
putc ('.'); puts ("Vpp Low Error.\n");
} }
flash_write_cmd (info, sector, 0, info->cmd_reset);
break;
default:
break;
} }
puts (" done\n"); return retcode;
return rcode;
} }
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
*/ */
void flash_print_info (flash_info_t * info) static void flash_add_byte (flash_info_t * info, cfiword_t * cword, uchar c)
{ {
int i; #if defined(__LITTLE_ENDIAN) && !defined(CFG_WRITE_SWAPPED_DATA)
unsigned short w;
if (info->flash_id != FLASH_MAN_CFI) { unsigned int l;
puts ("missing or unknown FLASH type\n"); unsigned long long ll;
return; #endif
}
printf ("%s FLASH (%d x %d)", switch (info->portwidth) {
info->name, case FLASH_CFI_8BIT:
(info->portwidth << 3), (info->chipwidth << 3)); cword->c = c;
if (info->size < 1024*1024) break;
printf (" Size: %ld kB in %d Sectors\n", case FLASH_CFI_16BIT:
info->size >> 10, info->sector_count); #if defined(__LITTLE_ENDIAN) && !defined(CFG_WRITE_SWAPPED_DATA)
else w = c;
printf (" Size: %ld MB in %d Sectors\n", w <<= 8;
info->size >> 20, info->sector_count); cword->w = (cword->w >> 8) | w;
printf (" "); #else
switch (info->vendor) { cword->w = (cword->w << 8) | c;
case CFI_CMDSET_INTEL_STANDARD:
printf ("Intel Standard");
break;
case CFI_CMDSET_INTEL_EXTENDED:
printf ("Intel Extended");
break;
case CFI_CMDSET_AMD_STANDARD:
printf ("AMD Standard");
break;
case CFI_CMDSET_AMD_EXTENDED:
printf ("AMD Extended");
break;
#ifdef CONFIG_FLASH_CFI_LEGACY
case CFI_CMDSET_AMD_LEGACY:
printf ("AMD Legacy");
break;
#endif #endif
default: break;
printf ("Unknown (%d)", info->vendor); case FLASH_CFI_32BIT:
break; #if defined(__LITTLE_ENDIAN) && !defined(CFG_WRITE_SWAPPED_DATA)
} l = c;
printf (" command set, Manufacturer ID: 0x%02X, Device ID: 0x%02X", l <<= 24;
info->manufacturer_id, info->device_id); cword->l = (cword->l >> 8) | l;
if (info->device_id == 0x7E) { #else
printf("%04X", info->device_id2); cword->l = (cword->l << 8) | c;
} #endif
printf ("\n Erase timeout: %ld ms, write timeout: %ld ms\n", break;
info->erase_blk_tout, case FLASH_CFI_64BIT:
info->write_tout); #if defined(__LITTLE_ENDIAN) && !defined(CFG_WRITE_SWAPPED_DATA)
if (info->buffer_size > 1) { ll = c;
printf (" Buffer write timeout: %ld ms, " ll <<= 56;
"buffer size: %d bytes\n", cword->ll = (cword->ll >> 8) | ll;
info->buffer_write_tout, #else
info->buffer_size); cword->ll = (cword->ll << 8) | c;
#endif
break;
} }
}
puts ("\n Sector Start Addresses:"); /* loop through the sectors from the highest address when the passed
for (i = 0; i < info->sector_count; ++i) { * address is greater or equal to the sector address we have a match
if ((i % 5) == 0) */
printf ("\n"); static flash_sect_t find_sector (flash_info_t * info, ulong addr)
#ifdef CFG_FLASH_EMPTY_INFO {
int k; flash_sect_t sector;
int size;
int erased;
volatile unsigned long *flash;
/*
* Check if whole sector is erased
*/
if (i != (info->sector_count - 1))
size = info->start[i + 1] - info->start[i];
else
size = info->start[0] + info->size - info->start[i];
erased = 1;
flash = (volatile unsigned long *) info->start[i];
size = size >> 2; /* divide by 4 for longword access */
for (k = 0; k < size; k++) {
if (*flash++ != 0xffffffff) {
erased = 0;
break;
}
}
/* print empty and read-only info */ for (sector = info->sector_count - 1; sector >= 0; sector--) {
printf (" %08lX %c %s ", if (addr >= info->start[sector])
info->start[i], break;
erased ? 'E' : ' ',
info->protect[i] ? "RO" : " ");
#else /* ! CFG_FLASH_EMPTY_INFO */
printf (" %08lX %s ",
info->start[i],
info->protect[i] ? "RO" : " ");
#endif
} }
putc ('\n'); return sector;
return;
} }
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* Copy memory to flash, returns:
* 0 - OK
* 1 - write timeout
* 2 - Flash not erased
*/ */
int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt) static int flash_write_cfiword (flash_info_t * info, ulong dest,
cfiword_t cword)
{ {
ulong wp; cfiptr_t ctladdr;
ulong cp; cfiptr_t cptr;
int aln; int flag;
cfiword_t cword;
int i, rc;
#ifdef CFG_FLASH_USE_BUFFER_WRITE
int buffered_size;
#endif
/* get lower aligned address */
/* get lower aligned address */
wp = (addr & ~(info->portwidth - 1));
/* handle unaligned start */ ctladdr.cp = flash_make_addr (info, 0, 0);
if ((aln = addr - wp) != 0) { cptr.cp = (uchar *) dest;
cword.l = 0;
cp = wp;
for (i = 0; i < aln; ++i, ++cp)
flash_add_byte (info, &cword, (*(uchar *) cp));
for (; (i < info->portwidth) && (cnt > 0); i++) { /* Check if Flash is (sufficiently) erased */
flash_add_byte (info, &cword, *src++); switch (info->portwidth) {
cnt--; case FLASH_CFI_8BIT:
cp++; flag = ((cptr.cp[0] & cword.c) == cword.c);
} break;
for (; (cnt == 0) && (i < info->portwidth); ++i, ++cp) case FLASH_CFI_16BIT:
flash_add_byte (info, &cword, (*(uchar *) cp)); flag = ((cptr.wp[0] & cword.w) == cword.w);
if ((rc = flash_write_cfiword (info, wp, cword)) != 0) break;
return rc; case FLASH_CFI_32BIT:
wp = cp; flag = ((cptr.lp[0] & cword.l) == cword.l);
break;
case FLASH_CFI_64BIT:
flag = ((cptr.llp[0] & cword.ll) == cword.ll);
break;
default:
return 2;
} }
if (!flag)
return 2;
/* handle the aligned part */ /* Disable interrupts which might cause a timeout here */
#ifdef CFG_FLASH_USE_BUFFER_WRITE flag = disable_interrupts ();
buffered_size = (info->portwidth / info->chipwidth);
buffered_size *= info->buffer_size;
while (cnt >= info->portwidth) {
/* prohibit buffer write when buffer_size is 1 */
if (info->buffer_size == 1) {
cword.l = 0;
for (i = 0; i < info->portwidth; i++)
flash_add_byte (info, &cword, *src++);
if ((rc = flash_write_cfiword (info, wp, cword)) != 0)
return rc;
wp += info->portwidth;
cnt -= info->portwidth;
continue;
}
/* write buffer until next buffered_size aligned boundary */ switch (info->vendor) {
i = buffered_size - (wp % buffered_size); case CFI_CMDSET_INTEL_EXTENDED:
if (i > cnt) case CFI_CMDSET_INTEL_STANDARD:
i = cnt; flash_write_cmd (info, 0, 0, FLASH_CMD_CLEAR_STATUS);
if ((rc = flash_write_cfibuffer (info, wp, src, i)) != ERR_OK) flash_write_cmd (info, 0, 0, FLASH_CMD_WRITE);
return rc; break;
i -= i & (info->portwidth - 1); case CFI_CMDSET_AMD_EXTENDED:
wp += i; case CFI_CMDSET_AMD_STANDARD:
src += i; #ifdef CONFIG_FLASH_CFI_LEGACY
cnt -= i; case CFI_CMDSET_AMD_LEGACY:
} #endif
#else flash_unlock_seq (info, 0);
while (cnt >= info->portwidth) { flash_write_cmd (info, 0, info->addr_unlock1, AMD_CMD_WRITE);
cword.l = 0; break;
for (i = 0; i < info->portwidth; i++) {
flash_add_byte (info, &cword, *src++);
}
if ((rc = flash_write_cfiword (info, wp, cword)) != 0)
return rc;
wp += info->portwidth;
cnt -= info->portwidth;
}
#endif /* CFG_FLASH_USE_BUFFER_WRITE */
if (cnt == 0) {
return (0);
} }
/* switch (info->portwidth) {
* handle unaligned tail bytes case FLASH_CFI_8BIT:
*/ cptr.cp[0] = cword.c;
cword.l = 0; break;
for (i = 0, cp = wp; (i < info->portwidth) && (cnt > 0); ++i, ++cp) { case FLASH_CFI_16BIT:
flash_add_byte (info, &cword, *src++); cptr.wp[0] = cword.w;
--cnt; break;
} case FLASH_CFI_32BIT:
for (; i < info->portwidth; ++i, ++cp) { cptr.lp[0] = cword.l;
flash_add_byte (info, &cword, (*(uchar *) cp)); break;
case FLASH_CFI_64BIT:
cptr.llp[0] = cword.ll;
break;
} }
return flash_write_cfiword (info, wp, cword); /* re-enable interrupts if necessary */
} if (flag)
enable_interrupts ();
/*----------------------------------------------------------------------- return flash_full_status_check (info, find_sector (info, dest),
*/ info->write_tout, "write");
#ifdef CFG_FLASH_PROTECTION
int flash_real_protect (flash_info_t * info, long sector, int prot)
{
int retcode = 0;
flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS);
flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT);
if (prot)
flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT_SET);
else
flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT_CLEAR);
if ((retcode =
flash_full_status_check (info, sector, info->erase_blk_tout,
prot ? "protect" : "unprotect")) == 0) {
info->protect[sector] = prot;
/*
* On some of Intel's flash chips (marked via legacy_unlock)
* unprotect unprotects all locking.
*/
if ((prot == 0) && (info->legacy_unlock)) {
flash_sect_t i;
for (i = 0; i < info->sector_count; i++) {
if (info->protect[i])
flash_real_protect (info, i, 1);
}
}
}
return retcode;
}
/*-----------------------------------------------------------------------
* flash_read_user_serial - read the OneTimeProgramming cells
*/
void flash_read_user_serial (flash_info_t * info, void *buffer, int offset,
int len)
{
uchar *src;
uchar *dst;
dst = buffer;
src = flash_make_addr (info, 0, FLASH_OFFSET_USER_PROTECTION);
flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID);
memcpy (dst, src + offset, len);
flash_write_cmd (info, 0, 0, info->cmd_reset);
}
/*
* flash_read_factory_serial - read the device Id from the protection area
*/
void flash_read_factory_serial (flash_info_t * info, void *buffer, int offset,
int len)
{
uchar *src;
src = flash_make_addr (info, 0, FLASH_OFFSET_INTEL_PROTECTION);
flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID);
memcpy (buffer, src + offset, len);
flash_write_cmd (info, 0, 0, info->cmd_reset);
} }
#endif /* CFG_FLASH_PROTECTION */ #ifdef CFG_FLASH_USE_BUFFER_WRITE
/* static int flash_write_cfibuffer (flash_info_t * info, ulong dest, uchar * cp,
* flash_is_busy - check to see if the flash is busy int len)
*
* This routine checks the status of the chip and returns true if the
* chip is busy.
*/
static int flash_is_busy (flash_info_t * info, flash_sect_t sect)
{ {
int retval; flash_sect_t sector;
int cnt;
int retcode;
volatile cfiptr_t src;
volatile cfiptr_t dst;
switch (info->vendor) { switch (info->vendor) {
case CFI_CMDSET_INTEL_STANDARD: case CFI_CMDSET_INTEL_STANDARD:
case CFI_CMDSET_INTEL_EXTENDED: case CFI_CMDSET_INTEL_EXTENDED:
retval = !flash_isset (info, sect, 0, FLASH_STATUS_DONE); src.cp = cp;
break; dst.cp = (uchar *) dest;
sector = find_sector (info, dest);
flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS);
flash_write_cmd (info, sector, 0, FLASH_CMD_WRITE_TO_BUFFER);
retcode = flash_status_check (info, sector,
info->buffer_write_tout,
"write to buffer");
if (retcode == ERR_OK) {
/* reduce the number of loops by the width of
* the port */
switch (info->portwidth) {
case FLASH_CFI_8BIT:
cnt = len;
break;
case FLASH_CFI_16BIT:
cnt = len >> 1;
break;
case FLASH_CFI_32BIT:
cnt = len >> 2;
break;
case FLASH_CFI_64BIT:
cnt = len >> 3;
break;
default:
return ERR_INVAL;
break;
}
flash_write_cmd (info, sector, 0, (uchar) cnt - 1);
while (cnt-- > 0) {
switch (info->portwidth) {
case FLASH_CFI_8BIT:
*dst.cp++ = *src.cp++;
break;
case FLASH_CFI_16BIT:
*dst.wp++ = *src.wp++;
break;
case FLASH_CFI_32BIT:
*dst.lp++ = *src.lp++;
break;
case FLASH_CFI_64BIT:
*dst.llp++ = *src.llp++;
break;
default:
return ERR_INVAL;
break;
}
}
flash_write_cmd (info, sector, 0,
FLASH_CMD_WRITE_BUFFER_CONFIRM);
retcode = flash_full_status_check (
info, sector, info->buffer_write_tout,
"buffer write");
}
return retcode;
case CFI_CMDSET_AMD_STANDARD: case CFI_CMDSET_AMD_STANDARD:
case CFI_CMDSET_AMD_EXTENDED: case CFI_CMDSET_AMD_EXTENDED:
#ifdef CONFIG_FLASH_CFI_LEGACY src.cp = cp;
case CFI_CMDSET_AMD_LEGACY: dst.cp = (uchar *) dest;
#endif sector = find_sector (info, dest);
retval = flash_toggle (info, sect, 0, AMD_STATUS_TOGGLE);
break; flash_unlock_seq(info,0);
flash_write_cmd (info, sector, 0, AMD_CMD_WRITE_TO_BUFFER);
switch (info->portwidth) {
case FLASH_CFI_8BIT:
cnt = len;
flash_write_cmd (info, sector, 0, (uchar) cnt - 1);
while (cnt-- > 0) *dst.cp++ = *src.cp++;
break;
case FLASH_CFI_16BIT:
cnt = len >> 1;
flash_write_cmd (info, sector, 0, (uchar) cnt - 1);
while (cnt-- > 0) *dst.wp++ = *src.wp++;
break;
case FLASH_CFI_32BIT:
cnt = len >> 2;
flash_write_cmd (info, sector, 0, (uchar) cnt - 1);
while (cnt-- > 0) *dst.lp++ = *src.lp++;
break;
case FLASH_CFI_64BIT:
cnt = len >> 3;
flash_write_cmd (info, sector, 0, (uchar) cnt - 1);
while (cnt-- > 0) *dst.llp++ = *src.llp++;
break;
default:
return ERR_INVAL;
}
flash_write_cmd (info, sector, 0, AMD_CMD_WRITE_BUFFER_CONFIRM);
retcode = flash_full_status_check (info, sector,
info->buffer_write_tout,
"buffer write");
return retcode;
default: default:
retval = 0; debug ("Unknown Command Set\n");
return ERR_INVAL;
} }
debug ("flash_is_busy: %d\n", retval);
return retval;
} }
#endif /* CFG_FLASH_USE_BUFFER_WRITE */
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* wait for XSR.7 to be set. Time out with an error if it does not.
* This routine does not set the flash to read-array mode.
*/ */
static int flash_status_check (flash_info_t * info, flash_sect_t sector, int flash_erase (flash_info_t * info, int s_first, int s_last)
ulong tout, char *prompt)
{ {
ulong start; int rcode = 0;
int prot;
flash_sect_t sect;
#if CFG_HZ != 1000 if (info->flash_id != FLASH_MAN_CFI) {
tout *= CFG_HZ/1000; puts ("Can't erase unknown flash type - aborted\n");
#endif return 1;
}
if ((s_first < 0) || (s_first > s_last)) {
puts ("- no sectors to erase\n");
return 1;
}
/* Wait for command completion */ prot = 0;
start = get_timer (0); for (sect = s_first; sect <= s_last; ++sect) {
while (flash_is_busy (info, sector)) { if (info->protect[sect]) {
if (get_timer (start) > tout) { prot++;
printf ("Flash %s timeout at address %lx data %lx\n",
prompt, info->start[sector],
flash_read_long (info, sector, 0));
flash_write_cmd (info, sector, 0, info->cmd_reset);
return ERR_TIMOUT;
} }
udelay (1); /* also triggers watchdog */
} }
return ERR_OK; if (prot) {
} printf ("- Warning: %d protected sectors will not be erased!\n",
prot);
} else {
putc ('\n');
}
/*-----------------------------------------------------------------------
* Wait for XSR.7 to be set, if it times out print an error, otherwise
* do a full status check.
*
* This routine sets the flash to read-array mode.
*/
static int flash_full_status_check (flash_info_t * info, flash_sect_t sector,
ulong tout, char *prompt)
{
int retcode;
retcode = flash_status_check (info, sector, tout, prompt); for (sect = s_first; sect <= s_last; sect++) {
switch (info->vendor) { if (info->protect[sect] == 0) { /* not protected */
case CFI_CMDSET_INTEL_EXTENDED: switch (info->vendor) {
case CFI_CMDSET_INTEL_STANDARD: case CFI_CMDSET_INTEL_STANDARD:
if ((retcode == ERR_OK) case CFI_CMDSET_INTEL_EXTENDED:
&& !flash_isequal (info, sector, 0, FLASH_STATUS_DONE)) { flash_write_cmd (info, sect, 0,
retcode = ERR_INVAL; FLASH_CMD_CLEAR_STATUS);
printf ("Flash %s error at address %lx\n", prompt, flash_write_cmd (info, sect, 0,
info->start[sector]); FLASH_CMD_BLOCK_ERASE);
if (flash_isset (info, sector, 0, FLASH_STATUS_ECLBS | flash_write_cmd (info, sect, 0,
FLASH_STATUS_PSLBS)) { FLASH_CMD_ERASE_CONFIRM);
puts ("Command Sequence Error.\n"); break;
} else if (flash_isset (info, sector, 0, case CFI_CMDSET_AMD_STANDARD:
FLASH_STATUS_ECLBS)) { case CFI_CMDSET_AMD_EXTENDED:
puts ("Block Erase Error.\n"); flash_unlock_seq (info, sect);
retcode = ERR_NOT_ERASED; flash_write_cmd (info, sect,
} else if (flash_isset (info, sector, 0, info->addr_unlock1,
FLASH_STATUS_PSLBS)) { AMD_CMD_ERASE_START);
puts ("Locking Error\n"); flash_unlock_seq (info, sect);
} flash_write_cmd (info, sect, 0,
if (flash_isset (info, sector, 0, FLASH_STATUS_DPS)) { AMD_CMD_ERASE_SECTOR);
puts ("Block locked.\n"); break;
retcode = ERR_PROTECTED; #ifdef CONFIG_FLASH_CFI_LEGACY
case CFI_CMDSET_AMD_LEGACY:
flash_unlock_seq (info, 0);
flash_write_cmd (info, 0, info->addr_unlock1,
AMD_CMD_ERASE_START);
flash_unlock_seq (info, 0);
flash_write_cmd (info, sect, 0,
AMD_CMD_ERASE_SECTOR);
break;
#endif
default:
debug ("Unkown flash vendor %d\n",
info->vendor);
break;
} }
if (flash_isset (info, sector, 0, FLASH_STATUS_VPENS))
puts ("Vpp Low Error.\n"); if (flash_full_status_check
(info, sect, info->erase_blk_tout, "erase")) {
rcode = 1;
} else
putc ('.');
} }
flash_write_cmd (info, sector, 0, info->cmd_reset);
break;
default:
break;
} }
return retcode; puts (" done\n");
return rcode;
} }
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
*/ */
static void flash_add_byte (flash_info_t * info, cfiword_t * cword, uchar c) void flash_print_info (flash_info_t * info)
{ {
#if defined(__LITTLE_ENDIAN) && !defined(CFG_WRITE_SWAPPED_DATA) int i;
unsigned short w;
unsigned int l;
unsigned long long ll;
#endif
switch (info->portwidth) { if (info->flash_id != FLASH_MAN_CFI) {
case FLASH_CFI_8BIT: puts ("missing or unknown FLASH type\n");
cword->c = c; return;
break; }
case FLASH_CFI_16BIT:
#if defined(__LITTLE_ENDIAN) && !defined(CFG_WRITE_SWAPPED_DATA) printf ("%s FLASH (%d x %d)",
w = c; info->name,
w <<= 8; (info->portwidth << 3), (info->chipwidth << 3));
cword->w = (cword->w >> 8) | w; if (info->size < 1024*1024)
#else printf (" Size: %ld kB in %d Sectors\n",
cword->w = (cword->w << 8) | c; info->size >> 10, info->sector_count);
#endif else
break; printf (" Size: %ld MB in %d Sectors\n",
case FLASH_CFI_32BIT: info->size >> 20, info->sector_count);
#if defined(__LITTLE_ENDIAN) && !defined(CFG_WRITE_SWAPPED_DATA) printf (" ");
l = c; switch (info->vendor) {
l <<= 24; case CFI_CMDSET_INTEL_STANDARD:
cword->l = (cword->l >> 8) | l; printf ("Intel Standard");
#else break;
cword->l = (cword->l << 8) | c; case CFI_CMDSET_INTEL_EXTENDED:
#endif printf ("Intel Extended");
break; break;
case FLASH_CFI_64BIT: case CFI_CMDSET_AMD_STANDARD:
#if defined(__LITTLE_ENDIAN) && !defined(CFG_WRITE_SWAPPED_DATA) printf ("AMD Standard");
ll = c; break;
ll <<= 56; case CFI_CMDSET_AMD_EXTENDED:
cword->ll = (cword->ll >> 8) | ll; printf ("AMD Extended");
#else break;
cword->ll = (cword->ll << 8) | c; #ifdef CONFIG_FLASH_CFI_LEGACY
case CFI_CMDSET_AMD_LEGACY:
printf ("AMD Legacy");
break;
#endif #endif
break; default:
printf ("Unknown (%d)", info->vendor);
break;
}
printf (" command set, Manufacturer ID: 0x%02X, Device ID: 0x%02X",
info->manufacturer_id, info->device_id);
if (info->device_id == 0x7E) {
printf("%04X", info->device_id2);
}
printf ("\n Erase timeout: %ld ms, write timeout: %ld ms\n",
info->erase_blk_tout,
info->write_tout);
if (info->buffer_size > 1) {
printf (" Buffer write timeout: %ld ms, "
"buffer size: %d bytes\n",
info->buffer_write_tout,
info->buffer_size);
} }
}
puts ("\n Sector Start Addresses:");
for (i = 0; i < info->sector_count; ++i) {
if ((i % 5) == 0)
printf ("\n");
#ifdef CFG_FLASH_EMPTY_INFO
int k;
int size;
int erased;
volatile unsigned long *flash;
/*----------------------------------------------------------------------- /*
* make a proper sized command based on the port and chip widths * Check if whole sector is erased
*/ */
static void flash_make_cmd (flash_info_t * info, uchar cmd, void *cmdbuf) if (i != (info->sector_count - 1))
{ size = info->start[i + 1] - info->start[i];
int i; else
uchar *cp = (uchar *) cmdbuf; size = info->start[0] + info->size - info->start[i];
erased = 1;
flash = (volatile unsigned long *) info->start[i];
size = size >> 2; /* divide by 4 for longword access */
for (k = 0; k < size; k++) {
if (*flash++ != 0xffffffff) {
erased = 0;
break;
}
}
#if defined(__LITTLE_ENDIAN) || defined(CFG_WRITE_SWAPPED_DATA) /* print empty and read-only info */
for (i = info->portwidth; i > 0; i--) printf (" %08lX %c %s ",
#else info->start[i],
for (i = 1; i <= info->portwidth; i++) erased ? 'E' : ' ',
info->protect[i] ? "RO" : " ");
#else /* ! CFG_FLASH_EMPTY_INFO */
printf (" %08lX %s ",
info->start[i],
info->protect[i] ? "RO" : " ");
#endif #endif
*cp++ = (i & (info->chipwidth - 1)) ? '\0' : cmd; }
putc ('\n');
return;
} }
/* /*-----------------------------------------------------------------------
* Write a proper sized command to the correct address * Copy memory to flash, returns:
* 0 - OK
* 1 - write timeout
* 2 - Flash not erased
*/ */
static void flash_write_cmd (flash_info_t * info, flash_sect_t sect, int write_buff (flash_info_t * info, uchar * src, ulong addr, ulong cnt)
uint offset, uchar cmd)
{ {
ulong wp;
volatile cfiptr_t addr; ulong cp;
int aln;
cfiword_t cword; cfiword_t cword;
int i, rc;
addr.cp = flash_make_addr (info, sect, offset); #ifdef CFG_FLASH_USE_BUFFER_WRITE
flash_make_cmd (info, cmd, &cword); int buffered_size;
switch (info->portwidth) {
case FLASH_CFI_8BIT:
debug ("fwc addr %p cmd %x %x 8bit x %d bit\n", addr.cp, cmd,
cword.c, info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
*addr.cp = cword.c;
break;
case FLASH_CFI_16BIT:
debug ("fwc addr %p cmd %x %4.4x 16bit x %d bit\n", addr.wp,
cmd, cword.w,
info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
*addr.wp = cword.w;
break;
case FLASH_CFI_32BIT:
debug ("fwc addr %p cmd %x %8.8lx 32bit x %d bit\n", addr.lp,
cmd, cword.l,
info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
*addr.lp = cword.l;
break;
case FLASH_CFI_64BIT:
#ifdef DEBUG
{
char str[20];
print_longlong (str, cword.ll);
debug ("fwrite addr %p cmd %x %s 64 bit x %d bit\n",
addr.llp, cmd, str,
info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
}
#endif #endif
*addr.llp = cword.ll; /* get lower aligned address */
break; /* get lower aligned address */
} wp = (addr & ~(info->portwidth - 1));
/* Ensure all the instructions are fully finished */ /* handle unaligned start */
sync(); if ((aln = addr - wp) != 0) {
} cword.l = 0;
cp = wp;
for (i = 0; i < aln; ++i, ++cp)
flash_add_byte (info, &cword, (*(uchar *) cp));
static void flash_unlock_seq (flash_info_t * info, flash_sect_t sect) for (; (i < info->portwidth) && (cnt > 0); i++) {
{ flash_add_byte (info, &cword, *src++);
flash_write_cmd (info, sect, info->addr_unlock1, AMD_CMD_UNLOCK_START); cnt--;
flash_write_cmd (info, sect, info->addr_unlock2, AMD_CMD_UNLOCK_ACK); cp++;
}
for (; (cnt == 0) && (i < info->portwidth); ++i, ++cp)
flash_add_byte (info, &cword, (*(uchar *) cp));
if ((rc = flash_write_cfiword (info, wp, cword)) != 0)
return rc;
wp = cp;
}
/* handle the aligned part */
#ifdef CFG_FLASH_USE_BUFFER_WRITE
buffered_size = (info->portwidth / info->chipwidth);
buffered_size *= info->buffer_size;
while (cnt >= info->portwidth) {
/* prohibit buffer write when buffer_size is 1 */
if (info->buffer_size == 1) {
cword.l = 0;
for (i = 0; i < info->portwidth; i++)
flash_add_byte (info, &cword, *src++);
if ((rc = flash_write_cfiword (info, wp, cword)) != 0)
return rc;
wp += info->portwidth;
cnt -= info->portwidth;
continue;
}
/* write buffer until next buffered_size aligned boundary */
i = buffered_size - (wp % buffered_size);
if (i > cnt)
i = cnt;
if ((rc = flash_write_cfibuffer (info, wp, src, i)) != ERR_OK)
return rc;
i -= i & (info->portwidth - 1);
wp += i;
src += i;
cnt -= i;
}
#else
while (cnt >= info->portwidth) {
cword.l = 0;
for (i = 0; i < info->portwidth; i++) {
flash_add_byte (info, &cword, *src++);
}
if ((rc = flash_write_cfiword (info, wp, cword)) != 0)
return rc;
wp += info->portwidth;
cnt -= info->portwidth;
}
#endif /* CFG_FLASH_USE_BUFFER_WRITE */
if (cnt == 0) {
return (0);
}
/*
* handle unaligned tail bytes
*/
cword.l = 0;
for (i = 0, cp = wp; (i < info->portwidth) && (cnt > 0); ++i, ++cp) {
flash_add_byte (info, &cword, *src++);
--cnt;
}
for (; i < info->portwidth; ++i, ++cp) {
flash_add_byte (info, &cword, (*(uchar *) cp));
}
return flash_write_cfiword (info, wp, cword);
} }
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
*/ */
static int flash_isequal (flash_info_t * info, flash_sect_t sect, #ifdef CFG_FLASH_PROTECTION
uint offset, uchar cmd)
int flash_real_protect (flash_info_t * info, long sector, int prot)
{ {
cfiptr_t cptr; int retcode = 0;
cfiword_t cword;
int retval;
cptr.cp = flash_make_addr (info, sect, offset); flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS);
flash_make_cmd (info, cmd, &cword); flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT);
if (prot)
flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT_SET);
else
flash_write_cmd (info, sector, 0, FLASH_CMD_PROTECT_CLEAR);
debug ("is= cmd %x(%c) addr %p ", cmd, cmd, cptr.cp); if ((retcode =
switch (info->portwidth) { flash_full_status_check (info, sector, info->erase_blk_tout,
case FLASH_CFI_8BIT: prot ? "protect" : "unprotect")) == 0) {
debug ("is= %x %x\n", cptr.cp[0], cword.c);
retval = (cptr.cp[0] == cword.c);
break;
case FLASH_CFI_16BIT:
debug ("is= %4.4x %4.4x\n", cptr.wp[0], cword.w);
retval = (cptr.wp[0] == cword.w);
break;
case FLASH_CFI_32BIT:
debug ("is= %8.8lx %8.8lx\n", cptr.lp[0], cword.l);
retval = (cptr.lp[0] == cword.l);
break;
case FLASH_CFI_64BIT:
#ifdef DEBUG
{
char str1[20];
char str2[20];
print_longlong (str1, cptr.llp[0]); info->protect[sector] = prot;
print_longlong (str2, cword.ll);
debug ("is= %s %s\n", str1, str2); /*
* On some of Intel's flash chips (marked via legacy_unlock)
* unprotect unprotects all locking.
*/
if ((prot == 0) && (info->legacy_unlock)) {
flash_sect_t i;
for (i = 0; i < info->sector_count; i++) {
if (info->protect[i])
flash_real_protect (info, i, 1);
}
} }
#endif
retval = (cptr.llp[0] == cword.ll);
break;
default:
retval = 0;
break;
} }
return retval; return retcode;
} }
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* flash_read_user_serial - read the OneTimeProgramming cells
*/ */
static int flash_isset (flash_info_t * info, flash_sect_t sect, void flash_read_user_serial (flash_info_t * info, void *buffer, int offset,
uint offset, uchar cmd) int len)
{ {
cfiptr_t cptr; uchar *src;
cfiword_t cword; uchar *dst;
int retval;
cptr.cp = flash_make_addr (info, sect, offset); dst = buffer;
flash_make_cmd (info, cmd, &cword); src = flash_make_addr (info, 0, FLASH_OFFSET_USER_PROTECTION);
switch (info->portwidth) { flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID);
case FLASH_CFI_8BIT: memcpy (dst, src + offset, len);
retval = ((cptr.cp[0] & cword.c) == cword.c); flash_write_cmd (info, 0, 0, info->cmd_reset);
break;
case FLASH_CFI_16BIT:
retval = ((cptr.wp[0] & cword.w) == cword.w);
break;
case FLASH_CFI_32BIT:
retval = ((cptr.lp[0] & cword.l) == cword.l);
break;
case FLASH_CFI_64BIT:
retval = ((cptr.llp[0] & cword.ll) == cword.ll);
break;
default:
retval = 0;
break;
}
return retval;
} }
/*----------------------------------------------------------------------- /*
* flash_read_factory_serial - read the device Id from the protection area
*/ */
static int flash_toggle (flash_info_t * info, flash_sect_t sect, void flash_read_factory_serial (flash_info_t * info, void *buffer, int offset,
uint offset, uchar cmd) int len)
{ {
cfiptr_t cptr; uchar *src;
cfiword_t cword;
int retval;
cptr.cp = flash_make_addr (info, sect, offset); src = flash_make_addr (info, 0, FLASH_OFFSET_INTEL_PROTECTION);
flash_make_cmd (info, cmd, &cword); flash_write_cmd (info, 0, 0, FLASH_CMD_READ_ID);
switch (info->portwidth) { memcpy (buffer, src + offset, len);
case FLASH_CFI_8BIT: flash_write_cmd (info, 0, 0, info->cmd_reset);
retval = ((cptr.cp[0] & cword.c) != (cptr.cp[0] & cword.c));
break;
case FLASH_CFI_16BIT:
retval = ((cptr.wp[0] & cword.w) != (cptr.wp[0] & cword.w));
break;
case FLASH_CFI_32BIT:
retval = ((cptr.lp[0] & cword.l) != (cptr.lp[0] & cword.l));
break;
case FLASH_CFI_64BIT:
retval = ((cptr.llp[0] & cword.ll) !=
(cptr.llp[0] & cword.ll));
break;
default:
retval = 0;
break;
}
return retval;
} }
#endif /* CFG_FLASH_PROTECTION */
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* read jedec ids from device and set corresponding fields in info struct * read jedec ids from device and set corresponding fields in info struct
* *
...@@ -1253,36 +1261,100 @@ static void flash_read_jedec_ids (flash_info_t * info) ...@@ -1253,36 +1261,100 @@ static void flash_read_jedec_ids (flash_info_t * info)
} }
} }
#ifdef CONFIG_FLASH_CFI_LEGACY
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* detect if flash is compatible with the Common Flash Interface (CFI) * Call board code to request info about non-CFI flash.
* http://www.jedec.org/download/search/jesd68.pdf * board_flash_get_legacy needs to fill in at least:
* info->portwidth, info->chipwidth and info->interface for Jedec probing.
*/ */
static int __flash_detect_cfi (flash_info_t * info) static int flash_detect_legacy(ulong base, int banknum)
{ {
int cfi_offset; flash_info_t *info = &flash_info[banknum];
flash_write_cmd (info, 0, 0, info->cmd_reset); if (board_flash_get_legacy(base, banknum, info)) {
for (cfi_offset=0; /* board code may have filled info completely. If not, we
cfi_offset < sizeof(flash_offset_cfi) / sizeof(uint); use JEDEC ID probing. */
cfi_offset++) { if (!info->vendor) {
flash_write_cmd (info, 0, flash_offset_cfi[cfi_offset], int modes[] = {
FLASH_CMD_CFI); CFI_CMDSET_AMD_STANDARD,
if (flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP, 'Q') CFI_CMDSET_INTEL_STANDARD
&& flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP + 1, 'R') };
&& flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP + 2, 'Y')) { int i;
info->interface = flash_read_ushort (info, 0,
FLASH_OFFSET_INTERFACE);
info->cfi_offset = flash_offset_cfi[cfi_offset];
debug ("device interface is %d\n",
info->interface);
debug ("found port %d chip %d ",
info->portwidth, info->chipwidth);
debug ("port %d bits chip %d bits\n",
info->portwidth << CFI_FLASH_SHIFT_WIDTH,
info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
/* calculate command offsets as in the Linux driver */ for (i = 0; i < sizeof(modes) / sizeof(modes[0]); i++) {
info->addr_unlock1 = 0x555; info->vendor = modes[i];
info->start[0] = base;
if (info->portwidth == FLASH_CFI_8BIT
&& info->interface == FLASH_CFI_X8X16) {
info->addr_unlock1 = 0x2AAA;
info->addr_unlock2 = 0x5555;
} else {
info->addr_unlock1 = 0x5555;
info->addr_unlock2 = 0x2AAA;
}
flash_read_jedec_ids(info);
debug("JEDEC PROBE: ID %x %x %x\n",
info->manufacturer_id,
info->device_id,
info->device_id2);
if (jedec_flash_match(info, base))
break;
}
}
switch(info->vendor) {
case CFI_CMDSET_INTEL_STANDARD:
case CFI_CMDSET_INTEL_EXTENDED:
info->cmd_reset = FLASH_CMD_RESET;
break;
case CFI_CMDSET_AMD_STANDARD:
case CFI_CMDSET_AMD_EXTENDED:
case CFI_CMDSET_AMD_LEGACY:
info->cmd_reset = AMD_CMD_RESET;
break;
}
info->flash_id = FLASH_MAN_CFI;
return 1;
}
return 0; /* use CFI */
}
#else
static inline int flash_detect_legacy(ulong base, int banknum)
{
return 0; /* use CFI */
}
#endif
/*-----------------------------------------------------------------------
* detect if flash is compatible with the Common Flash Interface (CFI)
* http://www.jedec.org/download/search/jesd68.pdf
*/
static int __flash_detect_cfi (flash_info_t * info)
{
int cfi_offset;
flash_write_cmd (info, 0, 0, info->cmd_reset);
for (cfi_offset=0;
cfi_offset < sizeof(flash_offset_cfi) / sizeof(uint);
cfi_offset++) {
flash_write_cmd (info, 0, flash_offset_cfi[cfi_offset],
FLASH_CMD_CFI);
if (flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP, 'Q')
&& flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP + 1, 'R')
&& flash_isequal (info, 0, FLASH_OFFSET_CFI_RESP + 2, 'Y')) {
info->interface = flash_read_ushort (info, 0,
FLASH_OFFSET_INTERFACE);
info->cfi_offset = flash_offset_cfi[cfi_offset];
debug ("device interface is %d\n",
info->interface);
debug ("found port %d chip %d ",
info->portwidth, info->chipwidth);
debug ("port %d bits chip %d bits\n",
info->portwidth << CFI_FLASH_SHIFT_WIDTH,
info->chipwidth << CFI_FLASH_SHIFT_WIDTH);
/* calculate command offsets as in the Linux driver */
info->addr_unlock1 = 0x555;
info->addr_unlock2 = 0x2aa; info->addr_unlock2 = 0x2aa;
/* /*
...@@ -1499,209 +1571,106 @@ ulong flash_get_size (ulong base, int banknum) ...@@ -1499,209 +1571,106 @@ ulong flash_get_size (ulong base, int banknum)
return (info->size); return (info->size);
} }
/* loop through the sectors from the highest address when the passed
* address is greater or equal to the sector address we have a match
*/
static flash_sect_t find_sector (flash_info_t * info, ulong addr)
{
flash_sect_t sector;
for (sector = info->sector_count - 1; sector >= 0; sector--) {
if (addr >= info->start[sector])
break;
}
return sector;
}
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
*/ */
static int flash_write_cfiword (flash_info_t * info, ulong dest, unsigned long flash_init (void)
cfiword_t cword)
{ {
cfiptr_t ctladdr; unsigned long size = 0;
cfiptr_t cptr; int i;
int flag;
ctladdr.cp = flash_make_addr (info, 0, 0);
cptr.cp = (uchar *) dest;
/* Check if Flash is (sufficiently) erased */
switch (info->portwidth) {
case FLASH_CFI_8BIT:
flag = ((cptr.cp[0] & cword.c) == cword.c);
break;
case FLASH_CFI_16BIT:
flag = ((cptr.wp[0] & cword.w) == cword.w);
break;
case FLASH_CFI_32BIT:
flag = ((cptr.lp[0] & cword.l) == cword.l);
break;
case FLASH_CFI_64BIT:
flag = ((cptr.llp[0] & cword.ll) == cword.ll);
break;
default:
return 2;
}
if (!flag)
return 2;
/* Disable interrupts which might cause a timeout here */
flag = disable_interrupts ();
switch (info->vendor) { #ifdef CFG_FLASH_PROTECTION
case CFI_CMDSET_INTEL_EXTENDED: char *s = getenv("unlock");
case CFI_CMDSET_INTEL_STANDARD:
flash_write_cmd (info, 0, 0, FLASH_CMD_CLEAR_STATUS);
flash_write_cmd (info, 0, 0, FLASH_CMD_WRITE);
break;
case CFI_CMDSET_AMD_EXTENDED:
case CFI_CMDSET_AMD_STANDARD:
#ifdef CONFIG_FLASH_CFI_LEGACY
case CFI_CMDSET_AMD_LEGACY:
#endif #endif
flash_unlock_seq (info, 0);
flash_write_cmd (info, 0, info->addr_unlock1, AMD_CMD_WRITE);
break;
}
switch (info->portwidth) { /* Init: no FLASHes known */
case FLASH_CFI_8BIT: for (i = 0; i < CFG_MAX_FLASH_BANKS; ++i) {
cptr.cp[0] = cword.c; flash_info[i].flash_id = FLASH_UNKNOWN;
break;
case FLASH_CFI_16BIT:
cptr.wp[0] = cword.w;
break;
case FLASH_CFI_32BIT:
cptr.lp[0] = cword.l;
break;
case FLASH_CFI_64BIT:
cptr.llp[0] = cword.ll;
break;
}
/* re-enable interrupts if necessary */ if (!flash_detect_legacy (bank_base[i], i))
if (flag) flash_get_size (bank_base[i], i);
enable_interrupts (); size += flash_info[i].size;
if (flash_info[i].flash_id == FLASH_UNKNOWN) {
#ifndef CFG_FLASH_QUIET_TEST
printf ("## Unknown FLASH on Bank %d "
"- Size = 0x%08lx = %ld MB\n",
i+1, flash_info[i].size,
flash_info[i].size << 20);
#endif /* CFG_FLASH_QUIET_TEST */
}
#ifdef CFG_FLASH_PROTECTION
else if ((s != NULL) && (strcmp(s, "yes") == 0)) {
/*
* Only the U-Boot image and it's environment
* is protected, all other sectors are
* unprotected (unlocked) if flash hardware
* protection is used (CFG_FLASH_PROTECTION)
* and the environment variable "unlock" is
* set to "yes".
*/
if (flash_info[i].legacy_unlock) {
int k;
return flash_full_status_check (info, find_sector (info, dest), /*
info->write_tout, "write"); * Disable legacy_unlock temporarily,
} * since flash_real_protect would
* relock all other sectors again
* otherwise.
*/
flash_info[i].legacy_unlock = 0;
#ifdef CFG_FLASH_USE_BUFFER_WRITE /*
* Legacy unlocking (e.g. Intel J3) ->
* unlock only one sector. This will
* unlock all sectors.
*/
flash_real_protect (&flash_info[i], 0, 0);
static int flash_write_cfibuffer (flash_info_t * info, ulong dest, uchar * cp, flash_info[i].legacy_unlock = 1;
int len)
{
flash_sect_t sector;
int cnt;
int retcode;
volatile cfiptr_t src;
volatile cfiptr_t dst;
switch (info->vendor) { /*
case CFI_CMDSET_INTEL_STANDARD: * Manually mark other sectors as
case CFI_CMDSET_INTEL_EXTENDED: * unlocked (unprotected)
src.cp = cp; */
dst.cp = (uchar *) dest; for (k = 1; k < flash_info[i].sector_count; k++)
sector = find_sector (info, dest); flash_info[i].protect[k] = 0;
flash_write_cmd (info, sector, 0, FLASH_CMD_CLEAR_STATUS); } else {
flash_write_cmd (info, sector, 0, FLASH_CMD_WRITE_TO_BUFFER); /*
retcode = flash_status_check (info, sector, * No legancy unlocking -> unlock all sectors
info->buffer_write_tout, */
"write to buffer"); flash_protect (FLAG_PROTECT_CLEAR,
if (retcode == ERR_OK) { flash_info[i].start[0],
/* reduce the number of loops by the width of flash_info[i].start[0]
* the port */ + flash_info[i].size - 1,
switch (info->portwidth) { &flash_info[i]);
case FLASH_CFI_8BIT:
cnt = len;
break;
case FLASH_CFI_16BIT:
cnt = len >> 1;
break;
case FLASH_CFI_32BIT:
cnt = len >> 2;
break;
case FLASH_CFI_64BIT:
cnt = len >> 3;
break;
default:
return ERR_INVAL;
break;
}
flash_write_cmd (info, sector, 0, (uchar) cnt - 1);
while (cnt-- > 0) {
switch (info->portwidth) {
case FLASH_CFI_8BIT:
*dst.cp++ = *src.cp++;
break;
case FLASH_CFI_16BIT:
*dst.wp++ = *src.wp++;
break;
case FLASH_CFI_32BIT:
*dst.lp++ = *src.lp++;
break;
case FLASH_CFI_64BIT:
*dst.llp++ = *src.llp++;
break;
default:
return ERR_INVAL;
break;
}
} }
flash_write_cmd (info, sector, 0,
FLASH_CMD_WRITE_BUFFER_CONFIRM);
retcode = flash_full_status_check (
info, sector, info->buffer_write_tout,
"buffer write");
} }
return retcode; #endif /* CFG_FLASH_PROTECTION */
}
case CFI_CMDSET_AMD_STANDARD:
case CFI_CMDSET_AMD_EXTENDED:
src.cp = cp;
dst.cp = (uchar *) dest;
sector = find_sector (info, dest);
flash_unlock_seq(info,0);
flash_write_cmd (info, sector, 0, AMD_CMD_WRITE_TO_BUFFER);
switch (info->portwidth) { /* Monitor protection ON by default */
case FLASH_CFI_8BIT: #if (CFG_MONITOR_BASE >= CFG_FLASH_BASE)
cnt = len; flash_protect (FLAG_PROTECT_SET,
flash_write_cmd (info, sector, 0, (uchar) cnt - 1); CFG_MONITOR_BASE,
while (cnt-- > 0) *dst.cp++ = *src.cp++; CFG_MONITOR_BASE + monitor_flash_len - 1,
break; flash_get_info(CFG_MONITOR_BASE));
case FLASH_CFI_16BIT: #endif
cnt = len >> 1;
flash_write_cmd (info, sector, 0, (uchar) cnt - 1);
while (cnt-- > 0) *dst.wp++ = *src.wp++;
break;
case FLASH_CFI_32BIT:
cnt = len >> 2;
flash_write_cmd (info, sector, 0, (uchar) cnt - 1);
while (cnt-- > 0) *dst.lp++ = *src.lp++;
break;
case FLASH_CFI_64BIT:
cnt = len >> 3;
flash_write_cmd (info, sector, 0, (uchar) cnt - 1);
while (cnt-- > 0) *dst.llp++ = *src.llp++;
break;
default:
return ERR_INVAL;
}
flash_write_cmd (info, sector, 0, AMD_CMD_WRITE_BUFFER_CONFIRM); /* Environment protection ON by default */
retcode = flash_full_status_check (info, sector, #ifdef CFG_ENV_IS_IN_FLASH
info->buffer_write_tout, flash_protect (FLAG_PROTECT_SET,
"buffer write"); CFG_ENV_ADDR,
return retcode; CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
flash_get_info(CFG_ENV_ADDR));
#endif
default: /* Redundant environment protection ON by default */
debug ("Unknown Command Set\n"); #ifdef CFG_ENV_ADDR_REDUND
return ERR_INVAL; flash_protect (FLAG_PROTECT_SET,
} CFG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1,
flash_get_info(CFG_ENV_ADDR_REDUND));
#endif
return (size);
} }
#endif /* CFG_FLASH_USE_BUFFER_WRITE */
#endif /* CFG_FLASH_CFI */ #endif /* CFG_FLASH_CFI */
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或