X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fflash.c;h=5ca26622beebd6a35367c942a68b1b069adde58b;hp=db4449d51720d8cbaf83c9df3592342749c3c05d;hb=6d1d58a1fc3dfd60e9cac89460b5a6e438d11efa;hpb=219b7f30b99c8af9f94fa1b10537bb0e2dc6209f diff --git a/src/flash/flash.c b/src/flash/flash.c index db4449d517..5ca26622be 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -2,6 +2,12 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * Copyright (C) 2007,2008 Øyvind Harboe * + * oyvind.harboe@zylin.com * + * * + * Copyright (C) 2008 by Spencer Oliver * + * spen@spen-soft.co.uk * + * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * @@ -22,36 +28,21 @@ #endif #include "flash.h" -#include "command.h" -#include "target.h" -#include "time_support.h" -#include "fileio.h" #include "image.h" -#include "log.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_banks_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_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); +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); /* flash drivers */ @@ -60,40 +51,49 @@ extern flash_driver_t cfi_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; -flash_driver_t *flash_drivers[] = -{ +flash_driver_t *flash_drivers[] = { &lpc2000_flash, &cfi_flash, &at91sam7_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, NULL, }; flash_bank_t *flash_banks; static command_t *flash_cmd; -static int auto_erase = 0; /* 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) { - ERROR("error writing to flash at address 0x%08x at offset 0x%8.8x", bank->base, offset); + LOG_ERROR("error writing to flash at address 0x%08" PRIx32 " at offset 0x%8.8" PRIx32 " (%d)", + bank->base, offset, retval); } return retval; @@ -103,10 +103,10 @@ 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) { - ERROR("failed erasing sectors %d to %d", first, last); + LOG_ERROR("failed erasing sectors %d to %d (%d)", first, last, retval); } return retval; @@ -116,32 +116,62 @@ 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) { - ERROR("failed setting protection for areas %d to %d", first, last); + LOG_ERROR("failed setting protection for areas %d to %d (%d)", first, last, retval); } return retval; } - 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, "auto_erase", handle_flash_auto_erase_command, COMMAND_ANY, - "auto erase flash sectors "); + 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; + } + + 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_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)); + Jim_ListAppendElement(interp, elem, Jim_NewIntObj(interp, p->base)); + Jim_ListAppendElement(interp, elem, Jim_NewStringObj(interp, "size", -1)); + Jim_ListAppendElement(interp, elem, Jim_NewIntObj(interp, p->size)); + Jim_ListAppendElement(interp, elem, Jim_NewStringObj(interp, "bus_width", -1)); + 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); + } + + Jim_SetResult(interp, list); + + return JIM_OK; +} + 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_command(cmd_ctx, flash_cmd, "banks", handle_flash_banks_command, COMMAND_EXEC, - "list configured 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, @@ -154,12 +184,20 @@ int flash_init_drivers(struct command_context_s *cmd_ctx) "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, "fillw", handle_flash_fill_command, COMMAND_EXEC, + "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, + "fill with pattern
"); + 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 [offset] [type]"); + "write_image [erase] [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; @@ -177,10 +215,21 @@ flash_bank_t *get_flash_bank_by_num_noprobe(int num) return p; } } - ERROR("flash bank %d does not exist", num); + LOG_ERROR("flash bank %d does not exist", num); return NULL; } +int flash_get_bank_count(void) +{ + flash_bank_t *p; + int i = 0; + for (p = flash_banks; p; p = p->next) + { + i++; + } + return i; +} + flash_bank_t *get_flash_bank_by_num(int num) { flash_bank_t *p = get_flash_bank_by_num_noprobe(num); @@ -193,14 +242,15 @@ flash_bank_t *get_flash_bank_by_num(int num) if (retval != ERROR_OK) { - ERROR("auto_probe failed %d\n", retval); + LOG_ERROR("auto_probe failed %d\n", retval); return NULL; } return p; } -int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +static int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { + int retval; int i; int found = 0; target_t *target; @@ -210,10 +260,10 @@ 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) { - ERROR("target %lu not defined", strtoul(args[5], NULL, 0)); - return ERROR_OK; + LOG_ERROR("target '%s' not defined", args[5]); + return ERROR_FAIL; } for (i = 0; flash_drivers[i]; i++) @@ -225,8 +275,8 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char /* register flash specific commands */ if (flash_drivers[i]->register_commands(cmd_ctx) != ERROR_OK) { - ERROR("couldn't register '%s' commands", args[0]); - exit(-1); + LOG_ERROR("couldn't register '%s' commands", args[0]); + return ERROR_FAIL; } c = malloc(sizeof(flash_bank_t)); @@ -241,24 +291,27 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char c->sectors = NULL; c->next = NULL; - if (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) { - 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 ERROR_OK; + return retval; } /* 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; @@ -268,38 +321,19 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char /* no matching flash driver found */ if (!found) { - ERROR("flash driver '%s' not found", args[0]); - exit(-1); - } - - return ERROR_OK; -} - -int handle_flash_banks_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) -{ - flash_bank_t *p; - int i = 0; - - if (!flash_banks) - { - command_print(cmd_ctx, "no flash banks configured"); - return ERROR_OK; - } - - for (p = flash_banks; p; p = p->next) - { - 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); + LOG_ERROR("flash driver '%s' not found", args[0]); + return ERROR_FAIL; } 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) { @@ -313,20 +347,20 @@ int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char char buf[1024]; /* attempt auto probe */ - p->driver->auto_probe(p); + 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 *erase_state, *protect_state; - - if (p->sectors[j].is_erased == 0) - erase_state = "not erased"; - else if (p->sectors[j].is_erased == 1) - erase_state = "erased"; - else - erase_state = "erase state unknown"; + char *protect_state; if (p->sectors[j].is_protected == 0) protect_state = "not protected"; @@ -335,20 +369,27 @@ 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, %s", - j, p->sectors[j].offset, p->sectors[j].size, p->sectors[j].size>>10, - erase_state, 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); } - p->driver->info(p, buf, 1024); + *buf = '\0'; /* initialize buffer, otherwise it migh contain garbage if driver function fails */ + retval = p->driver->info(p, buf, sizeof(buf)); command_print(cmd_ctx, "%s", buf); + if (retval != ERROR_OK) + LOG_ERROR("error retrieving flash info (%d)", retval); } } 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; @@ -363,16 +404,16 @@ int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, cha { 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); } } @@ -384,7 +425,7 @@ 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; @@ -397,21 +438,42 @@ int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cm p = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); 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; + + if (p->sectors[j].is_erased == 0) + erase_state = "not erased"; + else if (p->sectors[j].is_erased == 1) + erase_state = "erased"; + else + erase_state = "erase state unknown"; + + 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; @@ -438,7 +500,7 @@ int handle_flash_erase_address_command(struct command_context_s *cmd_ctx, char * p = get_flash_bank_by_addr(target, address); if (p == NULL) { - return ERROR_COMMAND_SYNTAX_ERROR; + return ERROR_FAIL; } /* We can't know if we did a resume + halt, in which case we no longer know the erased state */ @@ -448,7 +510,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); } @@ -456,7 +521,7 @@ 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; @@ -475,11 +540,11 @@ int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char * } 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 @@ -490,7 +555,7 @@ int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char * 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) { @@ -510,9 +575,13 @@ int handle_flash_erase_command(struct command_context_s *cmd_ctx, char *cmd, cha if ((retval = flash_driver_erase(p, first, last)) == 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 sectors %i through %i on flash bank %i in %s", first, last, strtoul(args[0], 0, 0), duration_text); + command_print(cmd_ctx, "erased sectors %i through %i on flash bank %li in %s", + first, last, strtoul(args[0], 0, 0), duration_text); free(duration_text); } } @@ -524,7 +593,7 @@ int handle_flash_erase_command(struct command_context_s *cmd_ctx, char *cmd, cha 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) { @@ -551,7 +620,9 @@ int handle_flash_protect_command(struct command_context_s *cmd_ctx, char *cmd, c 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)); + command_print(cmd_ctx, "%s protection for sectors %i through %i on flash bank %li", + (set) ? "set" : "cleared", first, + last, strtoul(args[0], 0, 0)); } } else @@ -563,28 +634,43 @@ int handle_flash_protect_command(struct command_context_s *cmd_ctx, char *cmd, c 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) + { + auto_erase = 1; + args++; + argc--; + command_print(cmd_ctx, "auto erase enabled"); + } + + if (argc < 1) + { + return ERROR_COMMAND_SYNTAX_ERROR; } if (!target) { - ERROR("no target selected"); - return ERROR_OK; + LOG_ERROR("no target selected"); + return ERROR_FAIL; } duration_start_measure(&duration); @@ -609,19 +695,25 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm } retval = flash_write(target, &image, &written, auto_erase); - if (retval != ERROR_OK) { image_close(&image); return retval; } - duration_stop_measure(&duration, &duration_text); + if ((retvaltemp = duration_stop_measure(&duration, &duration_text)) != ERROR_OK) + { + image_close(&image); + return retvaltemp; + } if (retval == 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))); + command_print(cmd_ctx, + "wrote %" PRIu32 " 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))); } free(duration_text); @@ -630,18 +722,138 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm return retval; } -int handle_flash_write_bank_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, 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); + 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; + + switch (cmd[4]) + { + case 'w': + wordsize = 4; + break; + case 'h': + wordsize = 2; + break; + case 'b': + wordsize = 1; + break; + default: + return ERROR_COMMAND_SYNTAX_ERROR; + } + + chunk_count = MIN(count, (1024 / wordsize)); + switch (wordsize) + { + case 4: + 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++) + { + target_buffer_set_u16(target, chunk + i * wordsize, pattern); + } + break; + case 1: + memset(chunk, pattern, chunk_count); + break; + default: + LOG_ERROR("BUG: can't happen"); + exit(-1); + } + + duration_start_measure(&duration); + + for (wrote = 0; wrote < (count*wordsize); wrote += cur_size) + { + 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]) + { + 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 ((retval = duration_stop_measure(&duration, &duration_text)) != ERROR_OK) + { + return retval; + } + + if (err == 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 %" PRId32 " bytes to 0x%8.8" PRIx32 " in %s (%f kb/s)", + count*wordsize, + address, + duration_text, + speed); + } + free(duration_text); + return ERROR_OK; +} + +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; + int retval, retvaltemp; flash_bank_t *p; if (argc != 3) @@ -667,19 +879,31 @@ int handle_flash_write_bank_command(struct command_context_s *cmd_ctx, char *cmd buffer = malloc(fileio.size); if (fileio_read(&fileio, fileio.size, buffer, &buf_cnt) != ERROR_OK) { + free(buffer); + fileio_close(&fileio); return ERROR_OK; } retval = flash_driver_write(p, buffer, offset, buf_cnt); free(buffer); + buffer = NULL; - 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 %"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))); + fileio_close(&fileio); + return retvaltemp; + } + if (retval == ERROR_OK) + { + command_print(cmd_ctx, + "wrote %lld byte from file %s to flash bank %li at offset 0x%8.8" PRIx32 " 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))); } free(duration_text); @@ -704,7 +928,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; @@ -716,19 +940,19 @@ flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr) if (retval != ERROR_OK) { - ERROR("auto_probe failed %d\n", retval); + LOG_ERROR("auto_probe failed %d\n", retval); return NULL; } /* check whether address belongs to this flash bank */ - if ((addr >= c->base) && (addr < c->base + c->size) && target == c->target) + if ((addr >= c->base) && (addr <= c->base + (c->size - 1)) && target == c->target) return c; } - 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) +int flash_erase_address_range(target_t *target, uint32_t addr, uint32_t length) { flash_bank_t *c; int first = -1; @@ -739,7 +963,10 @@ int flash_erase_address_range(target_t *target, u32 addr, u32 length) return ERROR_FLASH_DST_OUT_OF_BANK; /* no corresponding bank found */ if (c->size == 0 || c->num_sectors == 0) + { + LOG_ERROR("Bank is invalid"); return ERROR_FLASH_BANK_INVALID; + } if (length == 0) { @@ -751,7 +978,7 @@ int flash_erase_address_range(target_t *target, u32 addr, u32 length) } /* 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; @@ -767,20 +994,21 @@ 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); } /* 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) +int flash_write(target_t *target, image_t *image, uint32_t *written, int erase) { - int retval; + int retval = ERROR_OK; int section; - u32 section_offset; + uint32_t section_offset; flash_bank_t *c; + int *padding; section = 0; section_offset = 0; @@ -796,19 +1024,23 @@ 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) { - WARNING("empty section %d", section); + LOG_WARNING("empty section %d", section); section++; section_offset = 0; continue; @@ -825,22 +1057,35 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase) /* collect consecutive sections which fall into the same bank */ section_first = section; section_last = section; - while ((run_address + run_size < c->base + c->size) + padding[section] = 0; + 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)) { - DEBUG("section %d out of order(very slightly surprising, but supported)", section_last + 1); + LOG_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)) + /* if we have multiple sections within our image, flash programming could fail due to alignment issues + * attempt to rebuild a consecutive buffer for the flash loader */ + pad_bytes = (image->sections[section_last + 1].base_address) - (run_address + run_size); + if ((run_address + run_size + pad_bytes) > (c->base + c->size)) break; + padding[section_last] = pad_bytes; 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 ); } /* 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); @@ -849,21 +1094,24 @@ 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; - 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; + size_read = run_size - buffer_size; + if (size_read > image->sections[section].size - section_offset) + size_read = image->sections[section].size - section_offset; if ((retval = image_read_section(image, section, section_offset, size_read, buffer + buffer_size, &size_read)) != ERROR_OK || size_read == 0) { free(buffer); - + free(padding); return retval; } + /* see if we need to pad the section */ + while (padding[section]--) + (buffer + buffer_size)[size_read++] = 0xff; + buffer_size += size_read; section_offset += size_read; @@ -892,30 +1140,102 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase) if (retval != ERROR_OK) { - return retval; /* abort operation */ - } + free(padding); + return retval; /* abort operation */ + } if (written != NULL) *written += run_size; /* add run size to total written counter */ } + free(padding); + + return retval; +} + +int default_flash_mem_blank_check(struct flash_bank_s *bank) +{ + target_t *target = bank->target; + uint8_t buffer[1024]; + int buffer_size = sizeof(buffer); + int i; + 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++) + { + uint32_t j; + bank->sectors[i].is_erased = 1; + + for (j = 0; j < bank->sectors[i].size; j += buffer_size) + { + uint32_t chunk; + int retval; + chunk = buffer_size; + if (chunk > (j - bank->sectors[i].size)) + { + chunk = (j - bank->sectors[i].size); + } + + 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) + { + bank->sectors[i].is_erased = 0; + break; + } + } + } + } + return ERROR_OK; } -int handle_flash_auto_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +int default_flash_blank_check(struct flash_bank_s *bank) { - if (argc != 1) + target_t *target = bank->target; + int i; + int retval; + int fast_check = 0; + uint32_t blank; + + if (bank->target->state != TARGET_HALTED) { - return ERROR_COMMAND_SYNTAX_ERROR; + LOG_ERROR("Target not halted"); + return ERROR_TARGET_NOT_HALTED; + } + + for (i = 0; i < bank->num_sectors; i++) + { + 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; + break; + } + if (blank == 0xFF) + bank->sectors[i].is_erased = 1; + else + bank->sectors[i].is_erased = 0; + fast_check = 1; } - if (strcmp(args[0], "on") == 0) - auto_erase = 1; - else if (strcmp(args[0], "off") == 0) - auto_erase = 0; - else - return ERROR_COMMAND_SYNTAX_ERROR; + if (!fast_check) + { + LOG_USER("Running slow fallback erase check - add working memory"); + return default_flash_mem_blank_check(bank); + } return ERROR_OK; }