X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fflash.c;h=b40e074206b1cde8a39a4510accaf80684014e00;hp=5f9d78bc4a3565d9e7eb3b4497f1ae98e556bd4f;hb=e9566a4a6af9b16762c66cf632abbeafbe8f874f;hpb=68c598e88d5e09728ea845a81ab279c615bbaf0f diff --git a/src/flash/flash.c b/src/flash/flash.c index 5f9d78bc4a..b40e074206 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -2,7 +2,7 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * - * Copyright (C) 2007,2008 Øyvind Harboe * + * Copyright (C) 2007,2008 Øyvind Harboe * * oyvind.harboe@zylin.com * * * * Copyright (C) 2008 by Spencer Oliver * @@ -28,69 +28,63 @@ #endif #include "flash.h" -#include "command.h" -#include "target.h" -#include "time_support.h" -#include "fileio.h" #include "image.h" -#include "log.h" -#include "armv4_5.h" -#include "algorithm.h" -#include "binarybuffer.h" -#include "armv7m.h" - -#include -#include -#include -#include -#include -#include -#include +#include "time_support.h" /* command handlers */ -int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -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_bank_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_fill_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); -flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr); +static int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int handle_flash_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int handle_flash_protect_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int flash_write_unlock(target_t *target, image_t *image, uint32_t *written, int erase, bool unlock); /* flash drivers */ extern flash_driver_t lpc2000_flash; +extern flash_driver_t lpc288x_flash; +extern flash_driver_t lpc2900_flash; extern flash_driver_t cfi_flash; +extern flash_driver_t at91sam3_flash; extern flash_driver_t at91sam7_flash; extern flash_driver_t str7x_flash; extern flash_driver_t str9x_flash; +extern flash_driver_t aduc702x_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; extern flash_driver_t ecosflash_flash; -extern flash_driver_t lpc288x_flash; extern flash_driver_t ocl_flash; +extern flash_driver_t pic32mx_flash; +extern flash_driver_t avr_flash; +extern flash_driver_t faux_flash; -flash_driver_t *flash_drivers[] = -{ +flash_driver_t *flash_drivers[] = { &lpc2000_flash, + &lpc288x_flash, + &lpc2900_flash, &cfi_flash, &at91sam7_flash, + &at91sam3_flash, &str7x_flash, &str9x_flash, + &aduc702x_flash, &stellaris_flash, &str9xpec_flash, &stm32x_flash, &tms470_flash, &ecosflash_flash, - &lpc288x_flash, &ocl_flash, + &pic32mx_flash, + &avr_flash, + &faux_flash, NULL, }; @@ -98,14 +92,15 @@ flash_bank_t *flash_banks; static command_t *flash_cmd; /* wafer thin wrapper for invoking the flash driver */ -static int flash_driver_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int flash_driver_write(struct flash_bank_s *bank, uint8_t *buffer, uint32_t offset, uint32_t count) { int retval; - retval=bank->driver->write(bank, buffer, offset, count); - if (retval!=ERROR_OK) + retval = bank->driver->write(bank, buffer, offset, count); + if (retval != ERROR_OK) { - LOG_ERROR("error writing to flash at address 0x%08x at offset 0x%8.8x (%d)", bank->base, offset, retval); + LOG_ERROR("error writing to flash at address 0x%08" PRIx32 " at offset 0x%8.8" PRIx32 " (%d)", + bank->base, offset, retval); } return retval; @@ -115,8 +110,8 @@ static int flash_driver_erase(struct flash_bank_s *bank, int first, int last) { int retval; - retval=bank->driver->erase(bank, first, last); - if (retval!=ERROR_OK) + retval = bank->driver->erase(bank, first, last); + if (retval != ERROR_OK) { LOG_ERROR("failed erasing sectors %d to %d (%d)", first, last, retval); } @@ -128,8 +123,8 @@ int flash_driver_protect(struct flash_bank_s *bank, int set, int first, int last { int retval; - retval=bank->driver->protect(bank, set, first, last); - if (retval!=ERROR_OK) + retval = bank->driver->protect(bank, set, first, last); + if (retval != ERROR_OK) { LOG_ERROR("failed setting protection for areas %d to %d (%d)", first, last, retval); } @@ -141,29 +136,24 @@ int flash_register_commands(struct command_context_s *cmd_ctx) { flash_cmd = register_command(cmd_ctx, NULL, "flash", NULL, COMMAND_ANY, NULL); - register_command(cmd_ctx, flash_cmd, "bank", handle_flash_bank_command, COMMAND_CONFIG, "flash_bank [driver_options ...]"); + register_command(cmd_ctx, flash_cmd, "bank", handle_flash_bank_command, COMMAND_CONFIG, "flash bank [driver_options ...]"); return ERROR_OK; } static int jim_flash_banks(Jim_Interp *interp, int argc, Jim_Obj *const *argv) { flash_bank_t *p; - + if (argc != 1) { Jim_WrongNumArgs(interp, 1, argv, "no arguments to flash_banks command"); return JIM_ERR; } - if (!flash_banks) - { - return JIM_ERR; - } - - Jim_Obj *list=Jim_NewListObj(interp, NULL, 0); + Jim_Obj *list = Jim_NewListObj(interp, NULL, 0); for (p = flash_banks; p; p = p->next) { - Jim_Obj *elem=Jim_NewListObj(interp, NULL, 0); - + Jim_Obj *elem = Jim_NewListObj(interp, NULL, 0); + Jim_ListAppendElement(interp, elem, Jim_NewStringObj(interp, "name", -1)); Jim_ListAppendElement(interp, elem, Jim_NewStringObj(interp, p->driver->name, -1)); Jim_ListAppendElement(interp, elem, Jim_NewStringObj(interp, "base", -1)); @@ -174,7 +164,7 @@ static int jim_flash_banks(Jim_Interp *interp, int argc, Jim_Obj *const *argv) Jim_ListAppendElement(interp, elem, Jim_NewIntObj(interp, p->bus_width)); Jim_ListAppendElement(interp, elem, Jim_NewStringObj(interp, "chip_width", -1)); Jim_ListAppendElement(interp, elem, Jim_NewIntObj(interp, p->chip_width)); - + Jim_ListAppendElement(interp, list, elem); } @@ -185,10 +175,10 @@ static int jim_flash_banks(Jim_Interp *interp, int argc, Jim_Obj *const *argv) int flash_init_drivers(struct command_context_s *cmd_ctx) { + register_jim(cmd_ctx, "ocd_flash_banks", jim_flash_banks, "return information about the flash banks"); + if (flash_banks) { - register_jim(cmd_ctx, "ocd_flash_banks", jim_flash_banks, "return information about the flash banks"); - register_command(cmd_ctx, flash_cmd, "info", handle_flash_info_command, COMMAND_EXEC, "print info about flash bank "); register_command(cmd_ctx, flash_cmd, "probe", handle_flash_probe_command, COMMAND_EXEC, @@ -203,7 +193,7 @@ int flash_init_drivers(struct command_context_s *cmd_ctx) "erase address range
"); register_command(cmd_ctx, flash_cmd, "fillw", handle_flash_fill_command, COMMAND_EXEC, - "fill with pattern
"); + "fill with pattern (no autoerase)
"); register_command(cmd_ctx, flash_cmd, "fillh", handle_flash_fill_command, COMMAND_EXEC, "fill with pattern
"); register_command(cmd_ctx, flash_cmd, "fillb", handle_flash_fill_command, COMMAND_EXEC, @@ -212,9 +202,9 @@ int flash_init_drivers(struct command_context_s *cmd_ctx) register_command(cmd_ctx, flash_cmd, "write_bank", handle_flash_write_bank_command, COMMAND_EXEC, "write binary data to "); register_command(cmd_ctx, flash_cmd, "write_image", handle_flash_write_image_command, COMMAND_EXEC, - "write_image [erase] [offset] [type]"); + "write_image [erase] [unlock] [offset] [type]"); register_command(cmd_ctx, flash_cmd, "protect", handle_flash_protect_command, COMMAND_EXEC, - "set protection of sectors at "); + "set protection of sectors at "); } return ERROR_OK; @@ -265,7 +255,24 @@ flash_bank_t *get_flash_bank_by_num(int num) return p; } -int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +int flash_command_get_bank_by_num( + struct command_context_s *cmd_ctx, char *str, flash_bank_t **bank) +{ + unsigned bank_num; + COMMAND_PARSE_NUMBER(uint, str, bank_num); + + *bank = get_flash_bank_by_num(bank_num); + if (!*bank) + { + command_print(cmd_ctx, + "flash bank '#%u' not found", bank_num); + return ERROR_INVALID_ARGUMENTS; + } + return ERROR_OK; +} + + +static int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { int retval; int i; @@ -277,9 +284,9 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char return ERROR_COMMAND_SYNTAX_ERROR; } - if ((target = get_target_by_num(strtoul(args[5], NULL, 0))) == NULL) + if ((target = get_target(args[5])) == NULL) { - LOG_ERROR("target %lu not defined", strtoul(args[5], NULL, 0)); + LOG_ERROR("target '%s' not defined", args[5]); return ERROR_FAIL; } @@ -300,17 +307,17 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char c->target = target; c->driver = flash_drivers[i]; c->driver_priv = NULL; - c->base = strtoul(args[1], NULL, 0); - c->size = strtoul(args[2], NULL, 0); - c->chip_width = strtoul(args[3], NULL, 0); - c->bus_width = strtoul(args[4], NULL, 0); + COMMAND_PARSE_NUMBER(u32, args[1], c->base); + COMMAND_PARSE_NUMBER(u32, args[2], c->size); + COMMAND_PARSE_NUMBER(int, args[3], c->chip_width); + COMMAND_PARSE_NUMBER(int, args[4], c->bus_width); c->num_sectors = 0; c->sectors = NULL; c->next = NULL; - if ((retval=flash_drivers[i]->flash_bank_command(cmd_ctx, cmd, args, argc, c)) != ERROR_OK) + if ((retval = flash_drivers[i]->flash_bank_command(cmd_ctx, cmd, args, argc, c)) != ERROR_OK) { - LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8x", args[0], c->base); + LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8" PRIx32 , args[0], c->base); free(c); return retval; } @@ -318,14 +325,17 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char /* put flash bank in linked list */ if (flash_banks) { + int bank_num = 0; /* find last flash bank */ - for (p = flash_banks; p && p->next; p = p->next); + for (p = flash_banks; p && p->next; p = p->next) bank_num++; if (p) p->next = c; + c->bank_number = bank_num + 1; } else { flash_banks = c; + c->bank_number = 0; } found = 1; @@ -342,21 +352,22 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char return ERROR_OK; } -int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +static int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { flash_bank_t *p; - int i = 0; + uint32_t i = 0; int j = 0; int retval; if (argc != 1) - { return ERROR_COMMAND_SYNTAX_ERROR; - } + + unsigned bank_nr; + COMMAND_PARSE_NUMBER(uint, args[0], bank_nr); for (p = flash_banks; p; p = p->next, i++) { - if (i == strtoul(args[0], NULL, 0)) + if (i == bank_nr) { char buf[1024]; @@ -364,8 +375,14 @@ int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char if ((retval = p->driver->auto_probe(p)) != ERROR_OK) return retval; - command_print(cmd_ctx, "#%i: %s at 0x%8.8x, size 0x%8.8x, buswidth %i, chipwidth %i", - i, p->driver->name, p->base, p->size, p->bus_width, p->chip_width); + command_print(cmd_ctx, + "#%" PRIi32 " : %s at 0x%8.8" PRIx32 ", size 0x%8.8" PRIx32 ", buswidth %i, chipwidth %i", + i, + p->driver->name, + p->base, + p->size, + p->bus_width, + p->chip_width); for (j = 0; j < p->num_sectors; j++) { char *protect_state; @@ -377,9 +394,13 @@ 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%x %ikB) %s", - j, p->sectors[j].offset, p->sectors[j].size, p->sectors[j].size>>10, - protect_state); + command_print(cmd_ctx, + "\t#%3i: 0x%8.8" PRIx32 " (0x%" PRIx32 " %" PRIi32 "kB) %s", + j, + p->sectors[j].offset, + p->sectors[j].size, + p->sectors[j].size >> 10, + protect_state); } *buf = '\0'; /* initialize buffer, otherwise it migh contain garbage if driver function fails */ @@ -393,9 +414,8 @@ int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char return ERROR_OK; } -int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +static int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - flash_bank_t *p; int retval; if (argc != 1) @@ -403,21 +423,23 @@ int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, cha return ERROR_COMMAND_SYNTAX_ERROR; } - p = get_flash_bank_by_num_noprobe(strtoul(args[0], NULL, 0)); + unsigned bank_nr; + COMMAND_PARSE_NUMBER(uint, args[0], bank_nr); + flash_bank_t *p = get_flash_bank_by_num_noprobe(bank_nr); if (p) { if ((retval = p->driver->probe(p)) == ERROR_OK) { - command_print(cmd_ctx, "flash '%s' found at 0x%8.8x", p->driver->name, p->base); + command_print(cmd_ctx, "flash '%s' found at 0x%8.8" PRIx32, p->driver->name, p->base); } else if (retval == ERROR_FLASH_BANK_INVALID) { - command_print(cmd_ctx, "probing failed for flash bank '#%s' at 0x%8.8x", + command_print(cmd_ctx, "probing failed for flash bank '#%s' at 0x%8.8" PRIx32, args[0], p->base); } else { - command_print(cmd_ctx, "unknown error when probing flash bank '#%s' at 0x%8.8x", + command_print(cmd_ctx, "unknown error when probing flash bank '#%s' at 0x%8.8" PRIx32, args[0], p->base); } } @@ -429,30 +451,31 @@ int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, cha return ERROR_OK; } -int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +static int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - flash_bank_t *p; - int retval; - if (argc != 1) { return ERROR_COMMAND_SYNTAX_ERROR; } - p = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); + flash_bank_t *p; + int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &p); + if (ERROR_OK != retval) + return retval; + if (p) { int j; if ((retval = p->driver->erase_check(p)) == ERROR_OK) { - command_print(cmd_ctx, "successfully checked erase state", p->driver->name, p->base); + command_print(cmd_ctx, "successfully checked erase state"); } else { - command_print(cmd_ctx, "unknown error when checking erase state of flash bank #%s at 0x%8.8x", + command_print(cmd_ctx, "unknown error when checking erase state of flash bank #%s at 0x%8.8" PRIx32, args[0], p->base); } - + for (j = 0; j < p->num_sectors; j++) { char *erase_state; @@ -464,17 +487,20 @@ int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cm else erase_state = "erase state unknown"; - command_print(cmd_ctx, "\t#%i: 0x%8.8x (0x%x %ikB) %s", - j, p->sectors[j].offset, p->sectors[j].size, p->sectors[j].size>>10, - erase_state); + command_print(cmd_ctx, + "\t#%3i: 0x%8.8" PRIx32 " (0x%" PRIx32 " %" PRIi32 "kB) %s", + j, + p->sectors[j].offset, + p->sectors[j].size, + p->sectors[j].size >> 10, + erase_state); } - } return ERROR_OK; } -int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +static int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { flash_bank_t *p; int retval; @@ -486,12 +512,10 @@ int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char * target_t *target = get_current_target(cmd_ctx); if (argc != 2) - { return ERROR_COMMAND_SYNTAX_ERROR; - } - address = strtoul(args[0], NULL, 0); - length = strtoul(args[1], NULL, 0); + COMMAND_PARSE_NUMBER(int, args[0], address); + COMMAND_PARSE_NUMBER(int, args[1], length); if (length <= 0) { command_print(cmd_ctx, "Length must be >0"); @@ -511,7 +535,10 @@ int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char * if ((retval = flash_erase_address_range(target, address, length)) == ERROR_OK) { - duration_stop_measure(&duration, &duration_text); + if ((retval = duration_stop_measure(&duration, &duration_text)) != ERROR_OK) + { + return retval; + } command_print(cmd_ctx, "erased address 0x%8.8x length %i in %s", address, length, duration_text); free(duration_text); } @@ -519,147 +546,193 @@ int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char * return retval; } -int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +static int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - flash_bank_t *p; - int retval; - if (argc != 1) - { return ERROR_COMMAND_SYNTAX_ERROR; - } - p = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); + flash_bank_t *p; + int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &p); + if (ERROR_OK != retval) + return retval; + if (p) { + int retval; if ((retval = p->driver->protect_check(p)) == ERROR_OK) { command_print(cmd_ctx, "successfully checked protect state"); } else if (retval == ERROR_FLASH_OPERATION_FAILED) { - command_print(cmd_ctx, "checking protection state failed (possibly unsupported) by flash #%s at 0x%8.8x", args[0], p->base); + command_print(cmd_ctx, "checking protection state failed (possibly unsupported) by flash #%s at 0x%8.8" PRIx32, args[0], p->base); } else { - command_print(cmd_ctx, "unknown error when checking protection state of flash bank '#%s' at 0x%8.8x", args[0], p->base); + command_print(cmd_ctx, "unknown error when checking protection state of flash bank '#%s' at 0x%8.8" PRIx32, args[0], p->base); } } - else - { - return ERROR_COMMAND_SYNTAX_ERROR; + + return ERROR_OK; +} + +static int flash_check_sector_parameters(struct command_context_s *cmd_ctx, + uint32_t first, uint32_t last, uint32_t num_sectors) +{ + if (!(first <= last)) { + command_print(cmd_ctx, "ERROR: " + "first sector must be <= last sector"); + return ERROR_FAIL; + } + + if (!(last <= (num_sectors - 1))) { + command_print(cmd_ctx, "ERROR: last sector must be <= %d", + (int) num_sectors - 1); + return ERROR_FAIL; } return ERROR_OK; } -int handle_flash_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +static int handle_flash_erase_command(struct command_context_s *cmd_ctx, + char *cmd, char **args, int argc) { if (argc > 2) { - int first = strtoul(args[1], NULL, 0); - int last = strtoul(args[2], NULL, 0); + uint32_t bank_nr; + uint32_t first; + uint32_t last; + + COMMAND_PARSE_NUMBER(u32, args[0], bank_nr); + flash_bank_t *p = get_flash_bank_by_num(bank_nr); + if (!p) + return ERROR_OK; + + COMMAND_PARSE_NUMBER(u32, args[1], first); + if (strcmp(args[2], "last") == 0) + last = p->num_sectors - 1; + else + COMMAND_PARSE_NUMBER(u32, args[2], last); + int retval; - flash_bank_t *p = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); + if ((retval = flash_check_sector_parameters(cmd_ctx, + first, last, p->num_sectors)) != ERROR_OK) + return retval; + duration_t duration; char *duration_text; - duration_start_measure(&duration); - if (!p) - { - return ERROR_COMMAND_SYNTAX_ERROR; - } - - if ((retval = flash_driver_erase(p, first, last)) == ERROR_OK) - { - duration_stop_measure(&duration, &duration_text); - - command_print(cmd_ctx, "erased sectors %i through %i on flash bank %i in %s", first, last, strtoul(args[0], 0, 0), duration_text); + if ((retval = flash_driver_erase(p, first, last)) == ERROR_OK) { + if ((retval = duration_stop_measure(&duration, + &duration_text)) != ERROR_OK) + return retval; + command_print(cmd_ctx, "erased sectors %i through %i " + "on flash bank %i in %s", + (int) first, (int) last, (int) bank_nr, + duration_text); free(duration_text); } } else - { return ERROR_COMMAND_SYNTAX_ERROR; - } return ERROR_OK; } -int handle_flash_protect_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +static int handle_flash_protect_command(struct command_context_s *cmd_ctx, + char *cmd, char **args, int argc) { if (argc > 3) { - int first = strtoul(args[1], NULL, 0); - int last = strtoul(args[2], NULL, 0); + uint32_t bank_nr; + uint32_t first; + uint32_t last; int set; - int retval; - flash_bank_t *p = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); + + COMMAND_PARSE_NUMBER(u32, args[0], bank_nr); + flash_bank_t *p = get_flash_bank_by_num(bank_nr); if (!p) - { - command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); return ERROR_OK; - } + + COMMAND_PARSE_NUMBER(u32, args[1], first); + if (strcmp(args[2], "last") == 0) + last = p->num_sectors - 1; + else + COMMAND_PARSE_NUMBER(u32, args[2], last); if (strcmp(args[3], "on") == 0) set = 1; else if (strcmp(args[3], "off") == 0) set = 0; else - { return ERROR_COMMAND_SYNTAX_ERROR; - } + + int retval; + if ((retval = flash_check_sector_parameters(cmd_ctx, + first, last, p->num_sectors)) != ERROR_OK) + return retval; retval = flash_driver_protect(p, set, first, last); - if (retval == ERROR_OK) - { - command_print(cmd_ctx, "%s protection for sectors %i through %i on flash bank %i", (set) ? "set" : "cleared", first, last, strtoul(args[0], 0, 0)); + if (retval == ERROR_OK) { + command_print(cmd_ctx, "%s protection for sectors %i " + "through %i on flash bank %i", + (set) ? "set" : "cleared", (int) first, + (int) last, (int) bank_nr); } } else - { return ERROR_COMMAND_SYNTAX_ERROR; - } - return ERROR_OK; } -int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +static int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { target_t *target = get_current_target(cmd_ctx); image_t image; - u32 written; + uint32_t written; duration_t duration; char *duration_text; - int retval; + int retval, retvaltemp; if (argc < 1) { return ERROR_COMMAND_SYNTAX_ERROR; } - + /* flash auto-erase is disabled by default*/ int auto_erase = 0; - - if (strcmp(args[0], "erase")==0) + bool auto_unlock = false; + + for (;;) { - auto_erase = 1; - args++; - argc--; - command_print(cmd_ctx, "auto erase enabled"); + if (strcmp(args[0], "erase") == 0) + { + auto_erase = 1; + args++; + argc--; + command_print(cmd_ctx, "auto erase enabled"); + } else if (strcmp(args[0], "unlock") == 0) + { + auto_unlock = true; + args++; + argc--; + command_print(cmd_ctx, "auto unlock enabled"); + } else + { + break; + } } - if (argc < 1) { return ERROR_COMMAND_SYNTAX_ERROR; } - + if (!target) { LOG_ERROR("no target selected"); @@ -671,7 +744,7 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm if (argc >= 2) { image.base_address_set = 1; - image.base_address = strtoul(args[1], NULL, 0); + COMMAND_PARSE_NUMBER(int, args[1], image.base_address); } else { @@ -687,20 +760,28 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm return retval; } - retval = flash_write(target, &image, &written, auto_erase); + retval = flash_write_unlock(target, &image, &written, auto_erase, auto_unlock); if (retval != ERROR_OK) { image_close(&image); return retval; } - duration_stop_measure(&duration, &duration_text); - if (retval == ERROR_OK) + if ((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK) { - command_print(cmd_ctx, "wrote %u byte from file %s in %s (%f kb/s)", - written, args[0], duration_text, - (float)written / 1024.0 / ((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0))); + image_close(&image); + return retvaltemp; } + + float speed; + + speed = written / 1024.0; + speed /= ((float)duration.duration.tv_sec + + ((float)duration.duration.tv_usec / 1000000.0)); + command_print(cmd_ctx, + "wrote %" PRIu32 " byte from file %s in %s (%f kb/s)", + written, args[0], duration_text, speed); + free(duration_text); image_close(&image); @@ -708,60 +789,59 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm return retval; } -int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +static int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - int err = ERROR_OK; - u32 address; - u32 pattern; - u32 count; - u8 chunk[1024]; - u32 wrote = 0; - int chunk_count; + int err = ERROR_OK, retval; + uint32_t address; + uint32_t pattern; + uint32_t count; + uint8_t chunk[1024]; + uint8_t readback[1024]; + uint32_t wrote = 0; + uint32_t cur_size = 0; + uint32_t chunk_count; char *duration_text; duration_t duration; target_t *target = get_current_target(cmd_ctx); - u32 i; - int wordsize; - + uint32_t i; + uint32_t wordsize; + if (argc != 3) - { return ERROR_COMMAND_SYNTAX_ERROR; - } - - address = strtoul(args[0], NULL, 0); - pattern = strtoul(args[1], NULL, 0); - count = strtoul(args[2], NULL, 0); - - if(count == 0) - return ERROR_OK; + COMMAND_PARSE_NUMBER(u32, args[0], address); + COMMAND_PARSE_NUMBER(u32, args[1], pattern); + COMMAND_PARSE_NUMBER(u32, args[2], count); - switch(cmd[4]) + if (count == 0) + return ERROR_OK; + + switch (cmd[4]) { case 'w': - wordsize=4; + wordsize = 4; break; case 'h': - wordsize=2; + wordsize = 2; break; case 'b': - wordsize=1; + wordsize = 1; break; default: return ERROR_COMMAND_SYNTAX_ERROR; } - + chunk_count = MIN(count, (1024 / wordsize)); - switch(wordsize) + switch (wordsize) { case 4: - for(i = 0; i < chunk_count; i++) + for (i = 0; i < chunk_count; i++) { target_buffer_set_u32(target, chunk + i * wordsize, pattern); } break; case 2: - for(i = 0; i < chunk_count; i++) + for (i = 0; i < chunk_count; i++) { target_buffer_set_u16(target, chunk + i * wordsize, pattern); } @@ -773,76 +853,80 @@ int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char LOG_ERROR("BUG: can't happen"); exit(-1); } - + duration_start_measure(&duration); - flash_set_dirty(); - err = flash_erase_address_range( target, address, count*wordsize ); - if (err == ERROR_OK) + for (wrote = 0; wrote < (count*wordsize); wrote += cur_size) { - for (wrote=0; wrote<(count*wordsize); wrote+=sizeof(chunk)) - { - int cur_size = MIN( (count*wordsize - wrote) , 1024 ); - if (err == ERROR_OK) + cur_size = MIN((count*wordsize - wrote), sizeof(chunk)); + flash_bank_t *bank; + bank = get_flash_bank_by_addr(target, address); + if (bank == NULL) + { + return ERROR_FAIL; + } + err = flash_driver_write(bank, chunk, address - bank->base + wrote, cur_size); + if (err != ERROR_OK) + return err; + + err = target_read_buffer(target, address + wrote, cur_size, readback); + if (err != ERROR_OK) + return err; + + unsigned i; + for (i = 0; i < cur_size; i++) + { + if (readback[i]!=chunk[i]) { - flash_bank_t *bank; - bank = get_flash_bank_by_addr(target, address); - if(bank == NULL) - { - err = ERROR_FAIL; - break; - } - err = flash_driver_write(bank, chunk, address - bank->base + wrote, cur_size); - wrote += cur_size; + LOG_ERROR("Verfication error address 0x%08" PRIx32 ", read back 0x%02x, expected 0x%02x", + address + wrote + i, readback[i], chunk[i]); + return ERROR_FAIL; } - if (err!=ERROR_OK) - break; } + } - - duration_stop_measure(&duration, &duration_text); - if(err == ERROR_OK) + if ((retval = duration_stop_measure(&duration, &duration_text)) != ERROR_OK) { - float speed; - speed=wrote / 1024.0; - speed/=((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0)); - command_print(cmd_ctx, "wrote %d bytes to 0x%8.8x in %s (%f kb/s)", - count*wordsize, address, duration_text, - speed); + return retval; } + + float speed; + + speed = wrote / 1024.0; + speed /= ((float)duration.duration.tv_sec + + ((float)duration.duration.tv_usec / 1000000.0)); + command_print(cmd_ctx, + "wrote %" PRIu32 " bytes to 0x%8.8" PRIx32 " in %s (%f kb/s)", + wrote, address, duration_text, speed); + free(duration_text); return ERROR_OK; } -int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +static int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - u32 offset; - u8 *buffer; - u32 buf_cnt; + uint32_t offset; + uint8_t *buffer; + uint32_t buf_cnt; fileio_t fileio; duration_t duration; char *duration_text; - int retval; - flash_bank_t *p; if (argc != 3) - { return ERROR_COMMAND_SYNTAX_ERROR; - } duration_start_measure(&duration); - offset = strtoul(args[2], NULL, 0); - p = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); - if (!p) - { - command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); - return ERROR_OK; - } + flash_bank_t *p; + int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &p); + if (ERROR_OK != retval) + return retval; + + COMMAND_PARSE_NUMBER(u32, args[2], offset); if (fileio_open(&fileio, args[1], FILEIO_READ, FILEIO_BINARY) != ERROR_OK) { @@ -862,12 +946,22 @@ int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd free(buffer); buffer = NULL; - duration_stop_measure(&duration, &duration_text); - if (retval!=ERROR_OK) + int retvaltemp; + if ((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK) + { + fileio_close(&fileio); + return retvaltemp; + } + if (retval == ERROR_OK) { - command_print(cmd_ctx, "wrote %"PRIi64" byte from file %s to flash bank %i at offset 0x%8.8x in %s (%f kb/s)", - fileio.size, args[1], strtoul(args[0], NULL, 0), offset, duration_text, - (float)fileio.size / 1024.0 / ((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0))); + float elapsed = (float)duration.duration.tv_sec; + elapsed += (float)duration.duration.tv_usec / 1000000.0; + float speed = (float)fileio.size / elapsed; + command_print(cmd_ctx, + "wrote %lld byte from file %s to flash bank %u " + "at offset 0x%8.8" PRIx32 " in %s (%f kb/s)", + fileio.size, args[1], p->bank_number, offset, + duration_text, speed / 1024); } free(duration_text); @@ -892,7 +986,7 @@ void flash_set_dirty(void) } /* lookup flash bank by address */ -flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr) +flash_bank_t *get_flash_bank_by_addr(target_t *target, uint32_t addr) { flash_bank_t *c; @@ -911,12 +1005,13 @@ flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr) if ((addr >= c->base) && (addr <= c->base + (c->size - 1)) && target == c->target) return c; } - LOG_ERROR("No flash at address 0x%08x\n", addr); + LOG_ERROR("No flash at address 0x%08" PRIx32 "\n", addr); return NULL; } /* erase given flash region, selects proper bank according to target and address */ -int flash_erase_address_range(target_t *target, u32 addr, u32 length) +static int flash_iterate_address_range(target_t *target, uint32_t addr, uint32_t length, + int (*callback)(struct flash_bank_s *bank, int first, int last)) { flash_bank_t *c; int first = -1; @@ -938,11 +1033,11 @@ int flash_erase_address_range(target_t *target, u32 addr, u32 length) if (addr != c->base) return ERROR_FLASH_DST_BREAKS_ALIGNMENT; - return flash_driver_erase(c, 0, c->num_sectors - 1); + return callback(c, 0, c->num_sectors - 1); } /* check whether it fits */ - if (addr + length > c->base + c->size) + if (addr + length - 1 > c->base + c->size - 1) return ERROR_FLASH_DST_BREAKS_ALIGNMENT; addr -= c->base; @@ -958,22 +1053,40 @@ int flash_erase_address_range(target_t *target, u32 addr, u32 length) } } - if( first == -1 || last == -1 ) + if (first == -1 || last == -1) return ERROR_OK; - return flash_driver_erase(c, first, last); + return callback(c, first, last); +} + + + +int flash_erase_address_range(target_t *target, uint32_t addr, uint32_t length) +{ + return flash_iterate_address_range(target, addr, length, &flash_driver_erase); +} + +static int flash_driver_unprotect(struct flash_bank_s *bank, int first, int last) +{ + return flash_driver_protect(bank, 0, first, last); +} + +static int flash_unlock_address_range(target_t *target, uint32_t addr, uint32_t length) +{ + return flash_iterate_address_range(target, addr, length, &flash_driver_unprotect); } + /* write (optional verify) an image to flash memory of the given target */ -int flash_write(target_t *target, image_t *image, u32 *written, int erase) +static int flash_write_unlock(target_t *target, image_t *image, uint32_t *written, int erase, bool unlock) { - int retval=ERROR_OK; + int retval = ERROR_OK; int section; - u32 section_offset; + uint32_t section_offset; flash_bank_t *c; int *padding; - + section = 0; section_offset = 0; @@ -987,21 +1100,21 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase) flash_set_dirty(); } - + /* allocate padding array */ padding = malloc(image->num_sections * sizeof(padding)); - + /* loop until we reach end of the image */ while (section < image->num_sections) { - u32 buffer_size; - u8 *buffer; + uint32_t buffer_size; + uint8_t *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; + uint32_t run_address = image->sections[section].base_address + section_offset; + uint32_t run_size = image->sections[section].size - section_offset; int pad_bytes = 0; - + if (image->sections[section].size == 0) { LOG_WARNING("empty section %d", section); @@ -1022,7 +1135,7 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase) section_first = section; section_last = section; padding[section] = 0; - while ((run_address + run_size < c->base + c->size) + while ((run_address + run_size - 1 < c->base + c->size - 1) && (section_last + 1 < image->num_sections)) { if (image->sections[section_last + 1].base_address < (run_address + run_size)) @@ -1039,13 +1152,17 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase) run_size += image->sections[++section_last].size; run_size += pad_bytes; padding[section_last] = 0; - - LOG_INFO("Padding image section %d with %d bytes", section_last-1, pad_bytes ); + + LOG_INFO("Padding image section %d with %d bytes", section_last-1, pad_bytes); } /* fit the run into bank constraints */ - if (run_address + run_size > c->base + c->size) + if (run_address + run_size - 1 > c->base + c->size - 1) + { + LOG_WARNING("writing %d bytes only - as image section is %d bytes and bank is only %d bytes", \ + (int)(c->base + c->size - run_address), (int)(run_size), (int)(c->size)); run_size = c->base + c->size - run_address; + } /* allocate buffer */ buffer = malloc(run_size); @@ -1054,7 +1171,7 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase) /* read sections to the buffer */ while (buffer_size < run_size) { - u32 size_read; + uint32_t size_read; size_read = run_size - buffer_size; if (size_read > image->sections[section].size - section_offset) @@ -1067,11 +1184,11 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase) free(padding); return retval; } - + /* see if we need to pad the section */ while (padding[section]--) - (buffer+buffer_size)[size_read++] = 0xff; - + (buffer + buffer_size)[size_read++] = 0xff; + buffer_size += size_read; section_offset += size_read; @@ -1084,10 +1201,17 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase) retval = ERROR_OK; - if (erase) + if (unlock) + { + retval = flash_unlock_address_range(target, run_address, run_size); + } + if (retval == ERROR_OK) { - /* calculate and erase sectors */ - retval = flash_erase_address_range( target, run_address, run_size ); + if (erase) + { + /* calculate and erase sectors */ + retval = flash_erase_address_range(target, run_address, run_size); + } } if (retval == ERROR_OK) @@ -1107,45 +1231,50 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase) if (written != NULL) *written += run_size; /* add run size to total written counter */ } - + free(padding); - + return retval; } +int flash_write(target_t *target, image_t *image, uint32_t *written, int erase) +{ + return flash_write_unlock(target, image, written, erase, false); +} + int default_flash_mem_blank_check(struct flash_bank_s *bank) { target_t *target = bank->target; - u8 buffer[1024]; + uint8_t buffer[1024]; int buffer_size = sizeof(buffer); int i; - int nBytes; - + uint32_t nBytes; + if (bank->target->state != TARGET_HALTED) { LOG_ERROR("Target not halted"); return ERROR_TARGET_NOT_HALTED; } - + for (i = 0; i < bank->num_sectors; i++) { - int j; + uint32_t j; bank->sectors[i].is_erased = 1; - + for (j = 0; j < bank->sectors[i].size; j += buffer_size) { - int chunk; + uint32_t chunk; int retval; chunk = buffer_size; if (chunk > (j - bank->sectors[i].size)) { chunk = (j - bank->sectors[i].size); } - - retval = target->type->read_memory(target, bank->base + bank->sectors[i].offset + j, 4, chunk/4, buffer); + + retval = target_read_memory(target, bank->base + bank->sectors[i].offset + j, 4, chunk/4, buffer); if (retval != ERROR_OK) return retval; - + for (nBytes = 0; nBytes < chunk; nBytes++) { if (buffer[nBytes] != 0xFF) @@ -1156,7 +1285,7 @@ int default_flash_mem_blank_check(struct flash_bank_s *bank) } } } - + return ERROR_OK; } @@ -1166,19 +1295,19 @@ int default_flash_blank_check(struct flash_bank_s *bank) int i; int retval; int fast_check = 0; - int blank; - + uint32_t blank; + if (bank->target->state != TARGET_HALTED) { LOG_ERROR("Target not halted"); return ERROR_TARGET_NOT_HALTED; } - + for (i = 0; i < bank->num_sectors; i++) { - u32 address = bank->base + bank->sectors[i].offset; - u32 size = bank->sectors[i].size; - + uint32_t address = bank->base + bank->sectors[i].offset; + uint32_t size = bank->sectors[i].size; + if ((retval = target_blank_check_memory(target, address, size, &blank)) != ERROR_OK) { fast_check = 0; @@ -1190,12 +1319,12 @@ int default_flash_blank_check(struct flash_bank_s *bank) bank->sectors[i].is_erased = 0; fast_check = 1; } - + if (!fast_check) { LOG_USER("Running slow fallback erase check - add working memory"); return default_flash_mem_blank_check(bank); } - + return ERROR_OK; }