Skip to content

Add interleaved verify mode #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rowanG077 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add interleaved verify mode #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 53 additions & 21 deletions ecpprog/ecpprog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ static void flash_start_read(int addr)
static void flash_continue_read(uint8_t *data, int n)
{
if (verbose)
fprintf(stderr, "Contiune Read +0x%03X..\n", n);
fprintf(stderr, "Continue Read +0x%03X..\n", n);

memset(data, 0, n);
send_spi(data, n);
Expand Down Expand Up @@ -758,6 +758,9 @@ static void help(const char *progname)
fprintf(stderr, " -R <size in bytes> read the specified number of bytes from flash\n");
fprintf(stderr, " (append 'k' to the argument for size in kilobytes,\n");
fprintf(stderr, " or 'M' for size in megabytes)\n");
fprintf(stderr, " -l Verify every written page immediately after write\n");
fprintf(stderr, " This make the total write/verify process slower but allows\n");
fprintf(stderr, " discovery of flash programming/connection issues quicker\n");
fprintf(stderr, " -c do not write flash, only verify (`check')\n");
fprintf(stderr, " -S perform SRAM programming\n");
fprintf(stderr, " -t just read the flash ID sequence\n");
Expand Down Expand Up @@ -806,6 +809,7 @@ int main(int argc, char **argv)
bool reinitialize = false;
bool read_mode = false;
bool check_mode = false;
bool interleaved_verify = false;
bool erase_mode = false;
bool bulk_erase = false;
bool dont_erase = false;
Expand All @@ -830,7 +834,7 @@ int main(int argc, char **argv)
/* Decode command line parameters */
int opt;
char *endptr;
while ((opt = getopt_long(argc, argv, "d:i:I:rR:e:o:k:scabnStvpX", long_options, NULL)) != -1) {
while ((opt = getopt_long(argc, argv, "d:i:I:rR:e:o:k:slcabnStvpX", long_options, NULL)) != -1) {
switch (opt) {
case 'd': /* device string */
devstr = optarg;
Expand Down Expand Up @@ -915,6 +919,9 @@ int main(int argc, char **argv)
case 's': /* use slow SPI clock */
clkdiv = 30;
break;
case 'l': /* Check every page after write */
interleaved_verify = true;
break;
case 'c': /* do not write just check */
check_mode = true;
break;
Expand Down Expand Up @@ -989,6 +996,11 @@ int main(int argc, char **argv)
return EXIT_FAILURE;
}

if (interleaved_verify && (read_mode || check_mode || prog_sram || test_mode)) {
fprintf(stderr, "%s: option `-l' only valid in programming mode\n", my_name);
return EXIT_FAILURE;
}

if (optind + 1 == argc) {
if (test_mode) {
fprintf(stderr, "%s: test mode doesn't take a file name\n", my_name);
Expand Down Expand Up @@ -1177,6 +1189,7 @@ int main(int argc, char **argv)
// ---------------------------------------------------------
// Program
// ---------------------------------------------------------
unsigned int read_blocksize = 256 * 32;

if (!read_mode && !check_mode)
{
Expand Down Expand Up @@ -1227,19 +1240,38 @@ int main(int argc, char **argv)

if (!erase_mode)
{
uint8_t buffer_flash[read_blocksize], buffer_file[read_blocksize], buffer_tx[256];
for (int rc, addr = 0; true; addr += rc) {
uint8_t buffer[256];

/* Show progress */
fprintf(stderr, "\r\033[0Kprogramming.. %04u/%04lu", addr, file_size);

int page_size = 256 - (rw_offset + addr) % 256;
rc = fread(buffer, 1, page_size, f);
rc = fread(buffer_file, 1, read_blocksize, f);
if (rc <= 0)
break;
flash_write_enable();
flash_prog(rw_offset + addr, buffer, rc);
flash_wait();

for (int written, block_offset = 0; block_offset < rc; block_offset += written) {
/* Show progress */
fprintf(stderr, "\r\033[0Kprogramming.. %04u/%04lu", addr + block_offset, file_size);

int write_addr = rw_offset + addr + block_offset;
written = 256 - write_addr % 256;
if (block_offset + written > read_blocksize) {
written = read_blocksize - block_offset;
}

memcpy(buffer_tx, buffer_file + block_offset, written);

flash_write_enable();
flash_prog(write_addr, buffer_tx, written);
flash_wait();
}

if (!disable_verify && interleaved_verify) {
flash_start_read(rw_offset + addr);
flash_continue_read(buffer_flash, rc);
flash_wait();
Copy link
Contributor Author

@rowanG077 rowanG077 Aug 21, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gregdavill From what I understand from SPI flash this wait here shouldn't be necessary. But without it the second page fails to write/read correctly.

if (memcmp(buffer_file, buffer_flash, rc)) {
fprintf(stderr, "Found difference between flash and file!\n");
jtag_error(3);
}
}

}

Expand All @@ -1256,23 +1288,23 @@ int main(int argc, char **argv)
if (read_mode) {

flash_start_read(rw_offset);
for (int addr = 0; addr < read_size; addr += 4096) {
uint8_t buffer[4096];
for (int addr = 0; addr < read_size; addr += read_blocksize) {
uint8_t buffer[read_blocksize];

/* Show progress */
fprintf(stderr, "\r\033[0Kreading.. %04u/%04u", addr + 4096, read_size);
fprintf(stderr, "\r\033[0Kreading.. %04u/%04u", addr + read_blocksize, read_size);

flash_continue_read(buffer, 4096);
fwrite(buffer, read_size - addr > 4096 ? 4096 : read_size - addr, 1, f);
flash_continue_read(buffer, read_blocksize);
fwrite(buffer, read_size - addr > read_blocksize ? read_blocksize : read_size - addr, 1, f);
}
fprintf(stderr, "\n");
} else if (!erase_mode && !disable_verify) {
} else if (!erase_mode && !disable_verify && !interleaved_verify) {

flash_start_read(rw_offset);
for (int addr = 0; addr < file_size; addr += 4096) {
uint8_t buffer_flash[4096], buffer_file[4096];
for (int addr = 0; addr < file_size; addr += read_blocksize) {
uint8_t buffer_flash[read_blocksize], buffer_file[read_blocksize];

int rc = fread(buffer_file, 1, 4096, f);
int rc = fread(buffer_file, 1, read_blocksize, f);
if (rc <= 0)
break;

Expand Down