X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fflash.c;h=2e7cc4537e2f7e41421bbe6b8536d71d22ef5217;hp=e3389b1938e9e22f2dd26a5a421d82bffe67d1e1;hb=1796e1602e9ffe1cbf35f1b001cb6a534bb2f738;hpb=20e4e77cdf366dedac21ff5670c54291feadfc05;ds=sidebyside diff --git a/src/flash/flash.c b/src/flash/flash.c index e3389b1938..2e7cc4537e 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -43,12 +43,15 @@ int handle_flash_banks_command(struct command_context_s *cmd_ctx, char *cmd, cha int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_flash_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_flash_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_flash_write_binary_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_flash_protect_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +int handle_flash_auto_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr); /* flash drivers */ @@ -60,6 +63,7 @@ extern flash_driver_t str9x_flash; extern flash_driver_t stellaris_flash; extern flash_driver_t str9xpec_flash; extern flash_driver_t stm32x_flash; +extern flash_driver_t tms470_flash; flash_driver_t *flash_drivers[] = { @@ -71,11 +75,13 @@ flash_driver_t *flash_drivers[] = &stellaris_flash, &str9xpec_flash, &stm32x_flash, + &tms470_flash, NULL, }; flash_bank_t *flash_banks; static command_t *flash_cmd; +static int auto_erase = 0; int flash_register_commands(struct command_context_s *cmd_ctx) { @@ -86,7 +92,7 @@ int flash_register_commands(struct command_context_s *cmd_ctx) return ERROR_OK; } -int flash_init(struct command_context_s *cmd_ctx) +int flash_init_drivers(struct command_context_s *cmd_ctx) { if (flash_banks) { @@ -101,15 +107,21 @@ int flash_init(struct command_context_s *cmd_ctx) register_command(cmd_ctx, flash_cmd, "protect_check", handle_flash_protect_check_command, COMMAND_EXEC, "check protection state of sectors in flash bank "); register_command(cmd_ctx, flash_cmd, "erase", handle_flash_erase_command, COMMAND_EXEC, + "DEPRECATED, use 'erase_sector' instead"); + register_command(cmd_ctx, flash_cmd, "erase_sector", handle_flash_erase_command, COMMAND_EXEC, "erase sectors at "); + register_command(cmd_ctx, flash_cmd, "erase_address", handle_flash_erase_address_command, COMMAND_EXEC, + "erase address range
"); register_command(cmd_ctx, flash_cmd, "write", handle_flash_write_binary_command, COMMAND_EXEC, - "DEPRECATED, use 'write_binary' or 'write_image' instead"); + "DEPRECATED, use 'write_binary' instead"); register_command(cmd_ctx, flash_cmd, "write_binary", handle_flash_write_binary_command, COMMAND_EXEC, "write binary "); register_command(cmd_ctx, flash_cmd, "write_image", handle_flash_write_image_command, COMMAND_EXEC, - "write image [offset] [type]"); + "write_image [offset] [type]"); register_command(cmd_ctx, flash_cmd, "protect", handle_flash_protect_command, COMMAND_EXEC, "set protection of sectors at "); + register_command(cmd_ctx, flash_cmd, "auto_erase", handle_flash_auto_erase_command, COMMAND_EXEC, + "auto erase flash sectors "); } return ERROR_OK; @@ -173,6 +185,8 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char c->size = strtoul(args[2], NULL, 0); c->chip_width = strtoul(args[3], NULL, 0); c->bus_width = strtoul(args[4], NULL, 0); + c->num_sectors = 0; + c->sectors = NULL; c->next = NULL; if (flash_drivers[i]->flash_bank_command(cmd_ctx, cmd, args, argc, c) != ERROR_OK) @@ -267,8 +281,8 @@ int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char else protect_state = "protection state unknown"; - command_print(cmd_ctx, "\t#%i: 0x%8.8x (0x%xkB) %s, %s", - j, p->sectors[j].offset, p->sectors[j].size, + command_print(cmd_ctx, "\t#%i: 0x%8.8x (0x%x %ikB) %s, %s", + j, p->sectors[j].offset, p->sectors[j].size, p->sectors[j].size>>10, erase_state, protect_state); } @@ -349,6 +363,76 @@ int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cm return ERROR_OK; } +int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +{ + flash_bank_t *p; + int retval; + int address; + int length; + duration_t duration; + char *duration_text; + + target_t *target = get_current_target(cmd_ctx); + + if (argc != 2) + { + command_print(cmd_ctx, "usage: flash erase_address
"); + return ERROR_OK; + } + + address = strtoul(args[0], NULL, 0); + length = strtoul(args[1], NULL, 0); + if (length <= 0) + { + command_print(cmd_ctx, "Length must be >0"); + return ERROR_INVALID_ARGUMENTS; + } + + p = get_flash_bank_by_addr(target, address); + if (p == NULL) + { + command_print(cmd_ctx, "No flash at that address"); + return ERROR_INVALID_ARGUMENTS; + } + + /* We can't know if we did a resume + halt, in which case we no longer know the erased state */ + flash_set_dirty(); + + duration_start_measure(&duration); + + if ((retval = flash_erase_address_range(target, address, length)) != ERROR_OK) + { + switch (retval) + { + case ERROR_TARGET_NOT_HALTED: + command_print(cmd_ctx, "can't work with this flash while target is running"); + break; + case ERROR_INVALID_ARGUMENTS: + command_print(cmd_ctx, "usage: flash erase_address
"); + break; + case ERROR_FLASH_BANK_INVALID: + command_print(cmd_ctx, "no '%s' flash found at 0x%8.8x", p->driver->name, p->base); + break; + case ERROR_FLASH_OPERATION_FAILED: + command_print(cmd_ctx, "flash erase error"); + break; + case ERROR_FLASH_SECTOR_INVALID: + command_print(cmd_ctx, "sector number(s) invalid"); + break; + default: + command_print(cmd_ctx, "unknown error"); + } + } + else + { + duration_stop_measure(&duration, &duration_text); + command_print(cmd_ctx, "erased address 0x%8.8x length %i in %s", address, length, duration_text); + free(duration_text); + } + + return retval; +} + int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { flash_bank_t *p; @@ -514,9 +598,9 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm target_t *target = get_current_target(cmd_ctx); image_t image; - u32 image_size; + u32 written; char *error_str; - u32 *failed; + int *failed; int i; @@ -524,17 +608,11 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm char *duration_text; int retval; - - if (!strcmp(cmd, "write")) - { - command_print(cmd_ctx, "'flash write' has been deprecated in favor of 'flash write_binary' and 'flash write_image'"); - DEBUG("'flash write' has been deprecated in favor of 'flash write_binary' and 'flash write_image'"); - } if (argc < 1) { - command_print(cmd_ctx, "usage: flash write [offset] [type]"); - return ERROR_OK; + command_print(cmd_ctx, "usage: flash %s [offset] [type]", cmd); + return ERROR_INVALID_ARGUMENTS; } if (!target) @@ -558,18 +636,29 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm image.start_address_set = 0; - if (image_open(&image, args[0], (argc == 4) ? args[2] : NULL) != ERROR_OK) + retval = image_open(&image, args[0], (argc == 3) ? args[2] : NULL); + if (retval != ERROR_OK) { - command_print(cmd_ctx, "flash write error: %s", image.error_str); - return ERROR_OK; + command_print(cmd_ctx, "image_open error: %s", image.error_str); + return retval; } - failed = malloc(sizeof(u32) * image.num_sections); + failed = malloc(sizeof(int) * image.num_sections); - if ((retval = flash_write(target, &image, &image_size, &error_str, failed)) != ERROR_OK) + error_str = NULL; + + retval = flash_write(target, &image, &written, &error_str, failed, auto_erase); + + if (retval != ERROR_OK) { - command_print(cmd_ctx, "failed writing image %s: %s", args[0], error_str); - free(error_str); + if (error_str) + { + command_print(cmd_ctx, "failed writing image %s: %s", args[0], error_str); + free(error_str); + } + image_close(&image); + free(failed); + return retval; } for (i = 0; i < image.num_sections; i++) @@ -583,9 +672,10 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm duration_stop_measure(&duration, &duration_text); command_print(cmd_ctx, "wrote %u byte from file %s in %s (%f kb/s)", - image_size, args[0], duration_text, - (float)image_size / 1024.0 / ((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0))); + written, args[0], duration_text, + (float)written / 1024.0 / ((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0))); free(duration_text); + free(failed); image_close(&image); @@ -608,7 +698,7 @@ int handle_flash_write_binary_command(struct command_context_s *cmd_ctx, char *c if (argc < 3) { - command_print(cmd_ctx, "usage: flash write "); + command_print(cmd_ctx, "usage: flash write_binary "); return ERROR_OK; } @@ -624,14 +714,14 @@ int handle_flash_write_binary_command(struct command_context_s *cmd_ctx, char *c if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK) { - command_print(cmd_ctx, "flash write error: %s", fileio.error_str); + command_print(cmd_ctx, "flash write_binary error: %s", fileio.error_str); return ERROR_OK; } buffer = malloc(fileio.size); if (fileio_read(&fileio, fileio.size, buffer, &buf_cnt) != ERROR_OK) { - command_print(cmd_ctx, "flash write error: %s", fileio.error_str); + command_print(cmd_ctx, "flash write_binary error: %s", fileio.error_str); return ERROR_OK; } @@ -639,6 +729,7 @@ int handle_flash_write_binary_command(struct command_context_s *cmd_ctx, char *c { command_print(cmd_ctx, "failed writing file %s to flash bank %i at offset 0x%8.8x", args[1], strtoul(args[0], NULL, 0), strtoul(args[2], NULL, 0)); + switch (retval) { case ERROR_TARGET_NOT_HALTED: @@ -680,6 +771,21 @@ int handle_flash_write_binary_command(struct command_context_s *cmd_ctx, char *c return ERROR_OK; } +void flash_set_dirty(void) +{ + flash_bank_t *c; + int i; + + /* set all flash to require erasing */ + for (c = flash_banks; c; c = c->next) + { + for (i = 0; i < c->num_sectors; i++) + { + c->sectors[i].is_erased = 0; + } + } +} + /* lookup flash bank by address */ flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr) { @@ -697,20 +803,19 @@ flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr) } /* erase given flash region, selects proper bank according to target and address */ -int flash_erase(target_t *target, u32 addr, u32 length) +int flash_erase_address_range(target_t *target, u32 addr, u32 length) { flash_bank_t *c; - unsigned long sector_size; - int first; - int last; - + int first = -1; + int last = -1; + int i; + if ((c = get_flash_bank_by_addr(target, addr)) == NULL) return ERROR_FLASH_DST_OUT_OF_BANK; /* no corresponding bank found */ - - /* sanity checks */ - if (c->size == 0 || c->num_sectors == 0 || c->size % c->num_sectors) - return ERROR_FLASH_BANK_INVALID; + if (c->size == 0 || c->num_sectors == 0) + return ERROR_FLASH_BANK_INVALID; + if (length == 0) { /* special case, erase whole bank when length is zero */ @@ -722,108 +827,221 @@ int flash_erase(target_t *target, u32 addr, u32 length) /* check whether it fits */ if (addr + length > c->base + c->size) - return ERROR_FLASH_DST_BREAKS_ALIGNMENT; - - /* calculate sector size */ - sector_size = c->size / c->num_sectors; - - /* check alignment */ - if ((addr - c->base) % sector_size || length % sector_size) return ERROR_FLASH_DST_BREAKS_ALIGNMENT; - - first = (addr - c->base) / sector_size; - last = first + length / sector_size - 1; + + addr -= c->base; + + for (i = 0; i < c->num_sectors; i++) + { + /* check whether sector overlaps with the given range and is not yet erased */ + if (addr < c->sectors[i].offset + c->sectors[i].size && addr + length > c->sectors[i].offset && c->sectors[i].is_erased != 1) { + /* if first is not set yet then this is the first sector */ + if (first == -1) + first = i; + last = i; /* and it is the last one so far in any case */ + } + } + + if( first == -1 || last == -1 ) + return ERROR_OK; + return c->driver->erase(c, first, last); } -int flash_write(target_t *target, image_t *image, u32 *image_size, char **error_str, u32 *failed) +/* write (optional verify) an image to flash memory of the given target */ +int flash_write(target_t *target, image_t *image, u32 *written, char **error_str, int *failed, int erase) { - int section; int retval; + int i; + + int section; + u32 section_offset; + flash_bank_t *c; - *image_size = 0; + section = 0; + section_offset = 0; + + if (written) + *written = 0; - /* for each section in the image */ - for (section = 0; section < image->num_sections; section++) + if (failed != NULL) + for (i = 0; i < image->num_sections; i++) + failed[i] = 0; + + if (erase) { - u32 offset = 0; - u32 address = image->sections[section].base_address; - u32 size = image->sections[section].size; - - failed[section] = 0; + /* assume all sectors need erasing - stops any problems + * when flash_write is called multiple times */ - while (size != 0) + flash_set_dirty(); + } + + /* loop until we reach end of the image */ + while (section < image->num_sections) + { + u32 buffer_size; + u8 *buffer; + int section_first; + int section_last; + u32 run_address = image->sections[section].base_address + section_offset; + u32 run_size = image->sections[section].size - section_offset; + + if (image->sections[section].size == 0) { - flash_bank_t *c; - u32 thisrun_size = size; - u32 size_read; - u8 *buffer; - - /* find the corresponding flash bank */ - if ((c = get_flash_bank_by_addr(target, address)) == NULL) + WARNING("empty section %d", section); + section++; + section_offset = 0; + continue; + } + + /* find the corresponding flash bank */ + if ((c = get_flash_bank_by_addr(target, run_address)) == NULL) + { + if (failed == NULL) { - /* mark as failed, and skip the current section */ - failed[section] = 1; - break; + if (error_str == NULL) + return ERROR_FLASH_DST_OUT_OF_BANK; /* abort operation */ + *error_str = malloc(FLASH_MAX_ERROR_STR); + snprintf(*error_str, FLASH_MAX_ERROR_STR, "no flash mapped at requested address"); + return ERROR_FLASH_DST_OUT_OF_BANK; /* abort operation */ } - - /* check whether it fits, split into multiple runs if not */ - if ((address + size) > (c->base + c->size)) - thisrun_size = c->base + c->size - address; + failed[section] = ERROR_FLASH_DST_OUT_OF_BANK; /* mark the section as failed */ + section++; /* and skip it */ + section_offset = 0; + continue; + } - buffer = malloc(thisrun_size); - if (((retval = image_read_section(image, section, offset, size, buffer, &size_read)) != ERROR_OK) - || (thisrun_size != size_read)) + /* collect consecutive sections which fall into the same bank */ + section_first = section; + section_last = section; + while ((run_address + run_size < c->base + c->size) + && (section_last + 1 < image->num_sections)) + { + if (image->sections[section_last + 1].base_address < (run_address + run_size)) { - *error_str = malloc(FLASH_MAX_ERROR_STR); - snprintf(*error_str, FLASH_MAX_ERROR_STR, "error reading from image"); - return ERROR_IMAGE_TEMPORARILY_UNAVAILABLE; + DEBUG("section %d out of order(very slightly surprising, but supported)", section_last + 1); + break; } + if (image->sections[section_last + 1].base_address != (run_address + run_size)) + break; + run_size += image->sections[++section_last].size; + } + + /* fit the run into bank constraints */ + if (run_address + run_size > c->base + c->size) + run_size = c->base + c->size - run_address; + + /* allocate buffer */ + buffer = malloc(run_size); + buffer_size = 0; + + /* read sections to the buffer */ + while (buffer_size < run_size) + { + u32 size_read; + + if (buffer_size - run_size <= image->sections[section].size - section_offset) + size_read = buffer_size - run_size; + else + size_read = image->sections[section].size - section_offset; - if ((retval = c->driver->write(c, buffer, address - c->base, thisrun_size)) != ERROR_OK) + if ((retval = image_read_section(image, section, section_offset, + size_read, buffer + buffer_size, &size_read)) != ERROR_OK || size_read == 0) { - /* mark the current section as failed */ - failed[section] = 1; + free(buffer); + + if (error_str == NULL) + return ERROR_IMAGE_TEMPORARILY_UNAVAILABLE; + *error_str = malloc(FLASH_MAX_ERROR_STR); - switch (retval) - { - case ERROR_TARGET_NOT_HALTED: - snprintf(*error_str, FLASH_MAX_ERROR_STR, "can't flash image while target is running"); - break; - case ERROR_INVALID_ARGUMENTS: - snprintf(*error_str, FLASH_MAX_ERROR_STR, "flash driver can't fulfill request"); - break; - case ERROR_FLASH_OPERATION_FAILED: - snprintf(*error_str, FLASH_MAX_ERROR_STR, "flash program error"); - break; - case ERROR_FLASH_DST_BREAKS_ALIGNMENT: - snprintf(*error_str, FLASH_MAX_ERROR_STR, "offset breaks required alignment"); - break; - case ERROR_FLASH_DST_OUT_OF_BANK: - snprintf(*error_str, FLASH_MAX_ERROR_STR, "no flash mapped at requested address"); - break; - case ERROR_FLASH_SECTOR_NOT_ERASED: - snprintf(*error_str, FLASH_MAX_ERROR_STR, "destination sector(s) not erased"); - break; - default: - snprintf(*error_str, FLASH_MAX_ERROR_STR, "unknown error: %i", retval); - } - free(buffer); + /* if image_read_section returned an error there's an error string we can pass on */ + if (retval != ERROR_OK) + snprintf(*error_str, FLASH_MAX_ERROR_STR, "error reading from image: %s", image->error_str); + else + snprintf(*error_str, FLASH_MAX_ERROR_STR, "error reading from image"); - /* abort operation */ - return retval; + return ERROR_IMAGE_TEMPORARILY_UNAVAILABLE; + } + + buffer_size += size_read; + section_offset += size_read; + + if (section_offset >= image->sections[section].size) + { + section++; + section_offset = 0; } - - free(buffer); - - offset += thisrun_size; - address += thisrun_size; - size -= thisrun_size; } + + retval = ERROR_OK; - *image_size += image->sections[section].size; + if (erase) + { + /* calculate and erase sectors */ + retval = flash_erase_address_range( target, run_address, run_size ); + } + + if (retval == ERROR_OK) + { + /* write flash sectors */ + retval = c->driver->write(c, buffer, run_address - c->base, run_size); + } + + free(buffer); + + if (retval != ERROR_OK) + { + if (error_str == NULL) + return retval; /* abort operation */ + + *error_str = malloc(FLASH_MAX_ERROR_STR); + switch (retval) + { + case ERROR_TARGET_NOT_HALTED: + snprintf(*error_str, FLASH_MAX_ERROR_STR, "can't flash image while target is running"); + break; + case ERROR_INVALID_ARGUMENTS: + snprintf(*error_str, FLASH_MAX_ERROR_STR, "flash driver can't fulfill request"); + break; + case ERROR_FLASH_OPERATION_FAILED: + snprintf(*error_str, FLASH_MAX_ERROR_STR, "flash program error"); + break; + case ERROR_FLASH_DST_BREAKS_ALIGNMENT: + snprintf(*error_str, FLASH_MAX_ERROR_STR, "offset breaks required alignment"); + break; + case ERROR_FLASH_DST_OUT_OF_BANK: + snprintf(*error_str, FLASH_MAX_ERROR_STR, "no flash mapped at requested address"); + break; + case ERROR_FLASH_SECTOR_NOT_ERASED: + snprintf(*error_str, FLASH_MAX_ERROR_STR, "destination sector(s) not erased"); + break; + default: + snprintf(*error_str, FLASH_MAX_ERROR_STR, "unknown error: %i", retval); + } + + return retval; /* abort operation */ + } + + if (written != NULL) + *written += run_size; /* add run size to total written counter */ } + + return ERROR_OK; +} + +int handle_flash_auto_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +{ + if (argc != 1) + { + command_print(cmd_ctx, "usage: flash auto_erase "); + return ERROR_OK; + } + + if (strcmp(args[0], "on") == 0) + auto_erase = 1; + else if (strcmp(args[0], "off") == 0) + auto_erase = 0; return ERROR_OK; }