X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fflash.c;h=71d054f5051bde8f4056a8bbc2b932424d66d65e;hb=04ee41de52065f648752c13652b3428260f1ac2a;hp=6f0523d0d631e09db33ccba175004c1e2df2b8dc;hpb=1341eb3b0aea74b939a5d7702f696b175d032647;p=openocd.git diff --git a/src/flash/flash.c b/src/flash/flash.c index 6f0523d0d6..2cf56ed57b 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,84 +28,58 @@ #endif #include "flash.h" -#include "command.h" -#include "log.h" -#include "target.h" - -#include -#include -#include -#include -#include -#include - -/* 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_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_protect_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +#include "common.h" +#include +#include /* flash drivers */ -extern flash_driver_t lpc2000_flash; -extern flash_driver_t cfi_flash; -extern flash_driver_t at91sam7_flash; -extern flash_driver_t str7x_flash; +extern struct flash_driver lpc2000_flash; +extern struct flash_driver lpc288x_flash; +extern struct flash_driver lpc2900_flash; +extern struct flash_driver cfi_flash; +extern struct flash_driver at91sam3_flash; +extern struct flash_driver at91sam7_flash; +extern struct flash_driver str7x_flash; +extern struct flash_driver str9x_flash; +extern struct flash_driver aduc702x_flash; +extern struct flash_driver stellaris_flash; +extern struct flash_driver str9xpec_flash; +extern struct flash_driver stm32x_flash; +extern struct flash_driver tms470_flash; +extern struct flash_driver ecosflash_flash; +extern struct flash_driver ocl_flash; +extern struct flash_driver pic32mx_flash; +extern struct flash_driver avr_flash; +extern struct flash_driver faux_flash; -flash_driver_t *flash_drivers[] = -{ +struct flash_driver *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, + &ocl_flash, + &pic32mx_flash, + &avr_flash, + &faux_flash, NULL, }; -flash_bank_t *flash_banks; -static command_t *flash_cmd; - -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, NULL); - - return ERROR_OK; -} - -int flash_init(struct command_context_s *cmd_ctx) -{ - 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, - "identify flash bank "); - register_command(cmd_ctx, flash_cmd, "erase_check", handle_flash_erase_check_command, COMMAND_EXEC, - "check erase state of sectors in flash bank "); - 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, - "erase sectors at "); - register_command(cmd_ctx, flash_cmd, "write", handle_flash_write_command, COMMAND_EXEC, - "write binary "); - register_command(cmd_ctx, flash_cmd, "protect", handle_flash_protect_command, COMMAND_EXEC, - "set protection of sectors at "); - } - - return ERROR_OK; -} +struct flash_bank *flash_banks; -flash_bank_t *get_flash_bank_by_num(int num) +struct flash_bank *get_flash_bank_by_num_noprobe(int num) { - flash_bank_t *p; + struct flash_bank *p; int i = 0; for (p = flash_banks; p; p = p->next) @@ -109,458 +89,171 @@ flash_bank_t *get_flash_bank_by_num(int num) return p; } } - + LOG_ERROR("flash bank %d does not exist", num); return NULL; } -/* flash_bank [driver_options ...] - */ -int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +int flash_get_bank_count(void) { - int i; - int found = 0; - - if (argc < 5) - { - WARNING("incomplete flash_bank configuration"); - return ERROR_OK; - } - - for (i = 0; flash_drivers[i]; i++) - { - if (strcmp(args[0], flash_drivers[i]->name) == 0) - { - flash_bank_t *p, *c; - - /* register flash specific commands */ - if (flash_drivers[i]->register_commands(cmd_ctx) != ERROR_OK) - { - ERROR("couldn't register '%s' commands", args[0]); - exit(-1); - } - - c = malloc(sizeof(flash_bank_t)); - 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); - c->next = NULL; - - if (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); - free(c); - return ERROR_OK; - } - - /* put flash bank in linked list */ - if (flash_banks) - { - /* find last flash bank */ - for (p = flash_banks; p && p->next; p = p->next); - if (p) - p->next = c; - } - else - { - flash_banks = c; - } - - found = 1; - } - } - - /* 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; + struct flash_bank *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); + i++; } - - return ERROR_OK; + return i; } -int handle_flash_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +struct flash_bank *get_flash_bank_by_name(const char *name) { - flash_bank_t *p; - int i = 0; - int j = 0; - - if (argc != 1) - { - command_print(cmd_ctx, "usage: flash info "); - return ERROR_OK; - } - - for (p = flash_banks; p; p = p->next) - { - if (i++ == strtoul(args[0], NULL, 0)) - { - char buf[1024]; - - 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); - 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"; - - if (p->sectors[j].is_protected == 0) - protect_state = "not protected"; - else if (p->sectors[j].is_protected == 1) - protect_state = "protected"; - else - protect_state = "protection state unknown"; + unsigned requested = get_flash_name_index(name); + unsigned found = 0; - command_print(cmd_ctx, "\t#%i: 0x%8.8x (0x%xkB) %s, %s", - j, p->sectors[j].offset, p->sectors[j].size, - erase_state, protect_state); - } - - p->driver->info(p, buf, 1024); - command_print(cmd_ctx, "%s", buf); - } + struct flash_bank *bank; + for (bank = flash_banks; NULL != bank; bank = bank->next) + { + if (strcmp(bank->name, name) == 0) + return bank; + if (!flash_driver_name_matches(bank->driver->name, name)) + continue; + if (++found < requested) + continue; + return bank; } - - return ERROR_OK; + return NULL; } -int handle_flash_probe_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +struct flash_bank *get_flash_bank_by_num(int num) { - flash_bank_t *p; + struct flash_bank *p = get_flash_bank_by_num_noprobe(num); int retval; - - if (argc != 1) - { - command_print(cmd_ctx, "usage: flash probe "); - return ERROR_OK; - } - - p = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); - 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); - } - else if (retval == ERROR_FLASH_BANK_INVALID) - { - command_print(cmd_ctx, "probing failed for flash bank '#%s' at 0x%8.8x", - args[0], p->base); - } - else - { - command_print(cmd_ctx, "unknown error when probing flash bank '#%s' at 0x%8.8x", - args[0], p->base); - } - } - else + + if (p == NULL) + return NULL; + + retval = p->driver->auto_probe(p); + + if (retval != ERROR_OK) { - command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); + LOG_ERROR("auto_probe failed %d\n", retval); + return NULL; } - - return ERROR_OK; + return p; } -int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +/* lookup flash bank by address */ +struct flash_bank *get_flash_bank_by_addr(struct target *target, uint32_t addr) { - flash_bank_t *p; - int retval; - - if (argc != 1) - { - command_print(cmd_ctx, "usage: flash erase_check "); - return ERROR_OK; - } - - p = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); - if (p) + struct flash_bank *c; + + /* cycle through bank list */ + for (c = flash_banks; c; c = c->next) { - if ((retval = p->driver->erase_check(p)) == ERROR_OK) - { - command_print(cmd_ctx, "successfully checked erase state", p->driver->name, p->base); - } - else + int retval; + retval = c->driver->auto_probe(c); + + if (retval != ERROR_OK) { - command_print(cmd_ctx, "unknown error when checking erase state of flash bank #%s at 0x%8.8x", - args[0], p->base); + 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 - 1)) && target == c->target) + return c; } - else - { - command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); - } - - return ERROR_OK; + LOG_ERROR("No flash at address 0x%08" PRIx32 "\n", addr); + return NULL; } -int handle_flash_protect_check_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +int default_flash_mem_blank_check(struct flash_bank *bank) { - flash_bank_t *p; - int retval; - - if (argc != 1) - { - command_print(cmd_ctx, "usage: flash protect_check "); - return ERROR_OK; - } - - p = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); - if (p) - { - 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); - } - else - { - command_print(cmd_ctx, "unknown error when checking protection state of flash bank '#%s' at 0x%8.8x", args[0], p->base); - } - } - else + struct target *target = bank->target; + const int buffer_size = 1024; + int i; + uint32_t nBytes; + int retval = ERROR_OK; + + if (bank->target->state != TARGET_HALTED) { - command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); + LOG_ERROR("Target not halted"); + return ERROR_TARGET_NOT_HALTED; } - - return ERROR_OK; -} -int handle_flash_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) -{ - if (argc > 2) + uint8_t *buffer = malloc(buffer_size); + + for (i = 0; i < bank->num_sectors; i++) { - int first = strtoul(args[1], NULL, 0); - int last = strtoul(args[2], NULL, 0); - int retval; - flash_bank_t *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; - } - - if ((retval = p->driver->erase(p, first, last)) != ERROR_OK) + uint32_t j; + bank->sectors[i].is_erased = 1; + + for (j = 0; j < bank->sectors[i].size; j += buffer_size) { - switch (retval) + uint32_t chunk; + chunk = buffer_size; + if (chunk > (j - bank->sectors[i].size)) { - 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 "); - 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; - case ERROR_OK: - command_print(cmd_ctx, "erased flash sectors %i to %i", first, last); - break; - default: - command_print(cmd_ctx, "unknown error"); + chunk = (j - bank->sectors[i].size); } - } - } - else - { - command_print(cmd_ctx, "usage: flash erase "); - } - return ERROR_OK; -} + retval = target_read_memory(target, bank->base + bank->sectors[i].offset + j, 4, chunk/4, buffer); + if (retval != ERROR_OK) + { + goto done; + } -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); - int set; - int retval; - flash_bank_t *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; - } - - if (strcmp(args[3], "on") == 0) - set = 1; - else if (strcmp(args[3], "off") == 0) - set = 0; - else - { - command_print(cmd_ctx, "usage: flash protect "); - return ERROR_OK; - } - - if ((retval = p->driver->protect(p, set, first, last)) != ERROR_OK) - { - switch (retval) + for (nBytes = 0; nBytes < chunk; nBytes++) { - case ERROR_TARGET_NOT_HALTED: - command_print(cmd_ctx, "can't work with this flash while target is running"); + if (buffer[nBytes] != 0xFF) + { + bank->sectors[i].is_erased = 0; break; - case ERROR_INVALID_ARGUMENTS: - command_print(cmd_ctx, "usage: flash protect "); - 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 program error"); - break; - case ERROR_FLASH_SECTOR_INVALID: - command_print(cmd_ctx, "sector number(s) invalid"); - break; - case ERROR_OK: - command_print(cmd_ctx, "protection of flash sectors %i to %i turned %s", first, last, args[3]); - break; - default: - command_print(cmd_ctx, "unknown error"); + } } } } - else - { - command_print(cmd_ctx, "usage: flash protect "); - } - return ERROR_OK; + done: + free(buffer); + + return retval; } -int handle_flash_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +int default_flash_blank_check(struct flash_bank *bank) { - FILE *binary; - u32 offset; - struct stat binary_stat; - u32 binary_size; - u8 *buffer; - u32 buf_cnt; + struct target *target = bank->target; + int i; int retval; - flash_bank_t *p; - struct timeval start, end, duration; + int fast_check = 0; + uint32_t blank; - gettimeofday(&start, NULL); - - if (argc < 3) - { - command_print(cmd_ctx, "usage: flash write "); - return ERROR_OK; - } - - 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; - } - - if (stat(args[1], &binary_stat) == -1) + if (bank->target->state != TARGET_HALTED) { - ERROR("couldn't stat() %s: %s", args[1], strerror(errno)); - return ERROR_OK; + LOG_ERROR("Target not halted"); + return ERROR_TARGET_NOT_HALTED; } - if (S_ISDIR(binary_stat.st_mode)) + for (i = 0; i < bank->num_sectors; i++) { - ERROR("%s is a directory", args[1]); - command_print(cmd_ctx,"%s is a directory", args[1]); - return ERROR_OK; - } - - if (binary_stat.st_size == 0){ - ERROR("Empty file %s", args[1]); - command_print(cmd_ctx,"Empty file %s", args[1]); - return ERROR_OK; - } - - if (!(binary = fopen(args[1], "rb"))) - { - ERROR("couldn't open %s: %s", args[1], strerror(errno)); - command_print(cmd_ctx, "couldn't open %s", args[1]); - return ERROR_OK; - } + uint32_t address = bank->base + bank->sectors[i].offset; + uint32_t size = bank->sectors[i].size; - binary_size = binary_stat.st_size; - buffer = malloc(binary_size); - buf_cnt = fread(buffer, 1, binary_size, binary); - - if ((retval = p->driver->write(p, buffer, offset, buf_cnt)) != ERROR_OK) - { - switch (retval) + if ((retval = target_blank_check_memory(target, address, size, &blank)) != ERROR_OK) { - 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 write "); - 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 program error"); - break; - case ERROR_FLASH_DST_BREAKS_ALIGNMENT: - command_print(cmd_ctx, "offset breaks required alignment"); - break; - case ERROR_FLASH_DST_OUT_OF_BANK: - command_print(cmd_ctx, "destination is out of flash bank (offset and/or file too large)"); - break; - case ERROR_FLASH_SECTOR_NOT_ERASED: - command_print(cmd_ctx, "destination sector(s) not erased"); - break; - default: - command_print(cmd_ctx, "unknown error"); + fast_check = 0; + break; } + if (blank == 0xFF) + bank->sectors[i].is_erased = 1; + else + bank->sectors[i].is_erased = 0; + fast_check = 1; } - free(buffer); - fclose(binary); - - gettimeofday(&end, NULL); - timeval_subtract(&duration, &end, &start); - - command_print(cmd_ctx, "wrote file %s to flash bank %i at offset 0x%8.8x in %is %ius", args[1], strtoul(args[0], NULL, 0), strtoul(args[2], NULL, 0), duration.tv_sec, duration.tv_usec); - - return ERROR_OK; + if (!fast_check) + { + LOG_USER("Running slow fallback erase check - add working memory"); + return default_flash_mem_blank_check(bank); + } + + return ERROR_OK; }