interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

NOR/CFI: use bus_width for memory access in cfi_write() 

During cfi_write(), head and tail of destination area
could be not aligned to bus_width.
Since write operation must be at bus_width size, source
buffer size is extended and buffer padded with current
values read from flash.

Force using bus_width to read current value from flash.
Do not use cfi_add_byte() anymore, to allow removing this
function later on.

Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
This commit is contained in:
Antonio Borneo 2010-05-07 13:50:42 +08:00 committed by Øyvind Harboe
parent a69cbf0f74
commit 34f70956ed
1 changed files with 15 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/flash/nor/cfi.c
View File

@ -1838,7 +1838,7 @@ static int cfi_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset,
struct cfi_flash_bank *cfi_info = bank->driver_priv; struct cfi_flash_bank *cfi_info = bank->driver_priv;
struct target *target = bank->target; struct target *target = bank->target;
uint32_t address = bank->base + offset; /* address of first byte to be programmed */ uint32_t address = bank->base + offset; /* address of first byte to be programmed */
uint32_t write_p, copy_p; uint32_t write_p;
int align; /* number of unaligned bytes */ int align; /* number of unaligned bytes */
int blk_count; /* number of bus_width bytes for block copy */ int blk_count; /* number of bus_width bytes for block copy */
uint8_t current_word[CFI_MAX_BUS_WIDTH * 4]; /* word (bus_width size) currently being programmed */ uint8_t current_word[CFI_MAX_BUS_WIDTH * 4]; /* word (bus_width size) currently being programmed */
@ -1863,46 +1863,18 @@ static int cfi_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset,
{ {
LOG_INFO("Fixup %d unaligned head bytes", align); LOG_INFO("Fixup %d unaligned head bytes", align);
for (i = 0; i < bank->bus_width; i++) /* read a complete word from flash */
current_word[i] = 0; if ((retval = target_read_memory(target, write_p, bank->bus_width, 1, current_word)) != ERROR_OK)
copy_p = write_p; return retval;
/* copy bytes before the first write address */ /* replace only bytes that must be written */
for (i = 0; i < align; ++i, ++copy_p) for (i = align; (i < bank->bus_width) && (count > 0); i++, count--)
{ current_word[i] = *buffer++;
uint8_t byte;
/* FIXME: access flash at bus_width size */
if ((retval = target_read_memory(target, copy_p, 1, 1, &byte)) != ERROR_OK)
{
return retval;
}
cfi_add_byte(bank, current_word, byte);
}
/* add bytes from the buffer */
for (; (i < bank->bus_width) && (count > 0); i++)
{
cfi_add_byte(bank, current_word, *buffer++);
count--;
copy_p++;
}
/* if the buffer is already finished, copy bytes after the last write address */
for (; (count == 0) && (i < bank->bus_width); ++i, ++copy_p)
{
uint8_t byte;
/* FIXME: access flash at bus_width size */
if ((retval = target_read_memory(target, copy_p, 1, 1, &byte)) != ERROR_OK)
{
return retval;
}
cfi_add_byte(bank, current_word, byte);
}
retval = cfi_write_word(bank, current_word, write_p); retval = cfi_write_word(bank, current_word, write_p);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
write_p = copy_p; write_p += bank->bus_width;
} }
/* handle blocks of bus_size aligned bytes */ /* handle blocks of bus_size aligned bytes */
@ -1995,25 +1967,14 @@ static int cfi_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset,
{ {
LOG_INFO("Fixup %" PRId32 " unaligned tail bytes", count); LOG_INFO("Fixup %" PRId32 " unaligned tail bytes", count);
copy_p = write_p; /* read a complete word from flash */
for (i = 0; i < bank->bus_width; i++) if ((retval = target_read_memory(target, write_p, bank->bus_width, 1, current_word)) != ERROR_OK)
current_word[i] = 0; return retval;
/* replace only bytes that must be written */
for (i = 0; (i < bank->bus_width) && (count > 0); i++, count--)
current_word[i] = *buffer++;
for (i = 0; (i < bank->bus_width) && (count > 0); ++i, ++copy_p)
{
cfi_add_byte(bank, current_word, *buffer++);
count--;
}
for (; i < bank->bus_width; ++i, ++copy_p)
{
uint8_t byte;
/* FIXME: access flash at bus_width size */
if ((retval = target_read_memory(target, copy_p, 1, 1, &byte)) != ERROR_OK)
{
return retval;
}
cfi_add_byte(bank, current_word, byte);
}
retval = cfi_write_word(bank, current_word, write_p); retval = cfi_write_word(bank, current_word, write_p);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;