X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fflash.c;h=5f09c72dd7b8f57497f1ac579d063a2c3873eb53;hb=279affdb982be60dd80517e5c07651726ac46b2c;hp=1e4edd622cffe60ceccb6f09a5b8989c4a746786;hpb=506ca886c4d89aabcffab2dfa6736dfcfc1396c5;p=openocd.git diff --git a/src/flash/flash.c b/src/flash/flash.c index 1e4edd622c..5f09c72dd7 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 * @@ -43,7 +49,6 @@ /* 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); @@ -62,8 +67,10 @@ flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr); extern flash_driver_t lpc2000_flash; extern flash_driver_t cfi_flash; extern flash_driver_t at91sam7_flash; +extern flash_driver_t at91sam7_old_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; @@ -72,13 +79,14 @@ extern flash_driver_t ecosflash_flash; extern flash_driver_t lpc288x_flash; extern flash_driver_t ocl_flash; -flash_driver_t *flash_drivers[] = -{ +flash_driver_t *flash_drivers[] = { &lpc2000_flash, &cfi_flash, &at91sam7_flash, + &at91sam7_old_flash, &str7x_flash, &str9x_flash, + &aduc702x_flash, &stellaris_flash, &str9xpec_flash, &stm32x_flash, @@ -140,12 +148,50 @@ int flash_register_commands(struct command_context_s *cmd_ctx) 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); + 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) { if (flash_banks) { - register_command(cmd_ctx, flash_cmd, "banks", handle_flash_banks_command, COMMAND_EXEC, - "list configured 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, @@ -193,7 +239,7 @@ flash_bank_t *get_flash_bank_by_num_noprobe(int num) return NULL; } -int flash_get_bank_count() +int flash_get_bank_count(void) { flash_bank_t *p; int i = 0; @@ -224,6 +270,7 @@ flash_bank_t *get_flash_bank_by_num(int num) 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; @@ -236,7 +283,7 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char if ((target = get_target_by_num(strtoul(args[5], NULL, 0))) == NULL) { LOG_ERROR("target %lu not defined", strtoul(args[5], NULL, 0)); - return ERROR_OK; + return ERROR_FAIL; } for (i = 0; flash_drivers[i]; i++) @@ -249,7 +296,7 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char if (flash_drivers[i]->register_commands(cmd_ctx) != ERROR_OK) { LOG_ERROR("couldn't register '%s' commands", args[0]); - exit(-1); + return ERROR_FAIL; } c = malloc(sizeof(flash_bank_t)); @@ -264,11 +311,11 @@ 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) { LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8x", args[0], c->base); free(c); - return ERROR_OK; + return retval; } /* put flash bank in linked list */ @@ -292,27 +339,7 @@ int handle_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char if (!found) { LOG_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); + return ERROR_FAIL; } return ERROR_OK; @@ -353,7 +380,7 @@ 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", + command_print(cmd_ctx, "\t#%3i: 0x%8.8x (0x%x %ikB) %s", j, p->sectors[j].offset, p->sectors[j].size, p->sectors[j].size>>10, protect_state); } @@ -428,7 +455,7 @@ int handle_flash_erase_check_command(struct command_context_s *cmd_ctx, char *cm command_print(cmd_ctx, "unknown error when checking erase state of flash bank #%s at 0x%8.8x", args[0], p->base); } - + for (j = 0; j < p->num_sectors; j++) { char *erase_state; @@ -440,11 +467,11 @@ 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", + command_print(cmd_ctx, "\t#%3i: 0x%8.8x (0x%x %ikB) %s", j, p->sectors[j].offset, p->sectors[j].size, p->sectors[j].size>>10, erase_state); } - + } return ERROR_OK; @@ -618,10 +645,10 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm { 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; @@ -629,13 +656,13 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm argc--; command_print(cmd_ctx, "auto erase enabled"); } - + if (argc < 1) { return ERROR_COMMAND_SYNTAX_ERROR; } - + if (!target) { LOG_ERROR("no target selected"); @@ -698,16 +725,16 @@ int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char target_t *target = get_current_target(cmd_ctx); u32 i; int 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; @@ -726,7 +753,7 @@ int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char default: return ERROR_COMMAND_SYNTAX_ERROR; } - + chunk_count = MIN(count, (1024 / wordsize)); switch(wordsize) { @@ -749,7 +776,7 @@ 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(); @@ -757,7 +784,7 @@ int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char if (err == ERROR_OK) { for (wrote=0; wrote<(count*wordsize); wrote+=sizeof(chunk)) - { + { int cur_size = MIN( (count*wordsize - wrote) , 1024 ); if (err == ERROR_OK) { @@ -775,7 +802,7 @@ int handle_flash_fill_command(struct command_context_s *cmd_ctx, char *cmd, char break; } } - + duration_stop_measure(&duration, &duration_text); if(err == ERROR_OK) @@ -884,7 +911,7 @@ flash_bank_t *get_flash_bank_by_addr(target_t *target, u32 addr) 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; } LOG_ERROR("No flash at address 0x%08x\n", addr); @@ -949,7 +976,7 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase) u32 section_offset; flash_bank_t *c; int *padding; - + section = 0; section_offset = 0; @@ -963,10 +990,10 @@ 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) { @@ -977,7 +1004,7 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase) u32 run_address = image->sections[section].base_address + section_offset; u32 run_size = image->sections[section].size - section_offset; int pad_bytes = 0; - + if (image->sections[section].size == 0) { LOG_WARNING("empty section %d", section); @@ -1015,7 +1042,7 @@ 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 ); } @@ -1032,10 +1059,9 @@ int flash_write(target_t *target, image_t *image, u32 *written, int erase) { u32 size_read; - if (buffer_size - run_size <= image->sections[section].size - section_offset) - size_read = buffer_size - run_size; - else - size_read = image->sections[section].size - section_offset; + 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) @@ -1044,11 +1070,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[size_read++] = 0xff; - + (buffer+buffer_size)[size_read++] = 0xff; + buffer_size += size_read; section_offset += size_read; @@ -1084,247 +1110,95 @@ 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 default_flash_blank_check(struct flash_bank_s *bank) +int default_flash_mem_blank_check(struct flash_bank_s *bank) { target_t *target = bank->target; u8 buffer[1024]; - int buffer_size=sizeof(buffer); + int buffer_size = sizeof(buffer); int i; int nBytes; - + if (bank->target->state != TARGET_HALTED) { + LOG_ERROR("Target not halted"); return ERROR_TARGET_NOT_HALTED; } - - int retval; - int fast_check=0; - working_area_t *erase_check_algorithm; -#if 0 - /* FIX! doesn't work yet... */ - /* - char test(char *a, int len, char t) - { - int i=0; - - for (i=0; i: - 0: b510 push {r4, lr} - 2: 0612 lsl r2, r2, #24 - 4: 1c04 mov r4, r0 (add r4, r0, #0) - 6: 0e10 lsr r0, r2, #24 - 8: 2200 mov r2, #0 - a: 2900 cmp r1, #0 - c: dd04 ble 18 - e: 5ca3 ldrb r3, [r4, r2] - 10: 3201 add r2, #1 - 12: 4018 and r0, r3 - 14: 428a cmp r2, r1 - 16: dbfa blt e - 18: bd10 pop {r4, pc} - 1a: 46c0 nop (mov r8, r8) - - - */ - u16 erase_check_code[] = - { - 0x0612,// lsl r2, r2, #24 - 0x1c04,// mov r4, r0 (add r4, r0, #0) - 0x0e10,// lsr r0, r2, #24 - 0x2200,// mov r2, #0 - 0x2900,// cmp r1, #0 - 0xdd04,// ble 18 - 0x5ca3,// ldrb r3, [r4, r2] - 0x3201,// add r2, #1 - 0x4018,// and r0, r3 - 0x428a,// cmp r2, r1 - 0xdbfa,// blt e - 0x46c0,// nop (mov r8, r8) - - }; - - - - /* make sure we have a working area */ - if (target_alloc_working_area(target, ((sizeof(erase_check_code)+3)/4)*4, &erase_check_algorithm) != ERROR_OK) - { - erase_check_algorithm = NULL; - } - - if (erase_check_algorithm) + + for (i = 0; i < bank->num_sectors; i++) { - u8 erase_check_code_buf[((sizeof(erase_check_code)+3)/4)*4]; - LOG_DEBUG("Running fast flash erase check"); - - for (i = 0; i < sizeof(erase_check_code)/sizeof(*erase_check_code); i++) - target_buffer_set_u16(target, erase_check_code_buf + (i*2), erase_check_code[i]); - - /* write algorithm code to working area */ - if ((retval=target->type->write_memory(target, erase_check_algorithm->address, 2, sizeof(erase_check_code)/sizeof(*erase_check_code), erase_check_code_buf))==ERROR_OK) + int j; + bank->sectors[i].is_erased = 1; + + for (j = 0; j < bank->sectors[i].size; j += buffer_size) { - for (i = 0; i < bank->num_sectors; i++) + int chunk; + int retval; + chunk = buffer_size; + if (chunk > (j - bank->sectors[i].size)) { - u32 address = bank->base + bank->sectors[i].offset; - u32 size = bank->sectors[i].size; - - reg_param_t reg_params[3]; - armv7m_algorithm_t arm_info; - - arm_info.common_magic = ARMV7M_COMMON_MAGIC; - arm_info.core_mode = ARMV7M_MODE_ANY; - arm_info.core_state = ARMV7M_STATE_THUMB; - - init_reg_param(®_params[0], "r0", 32, PARAM_OUT); - buf_set_u32(reg_params[0].value, 0, 32, address); - - init_reg_param(®_params[1], "r1", 32, PARAM_OUT); - buf_set_u32(reg_params[1].value, 0, 32, size); - - init_reg_param(®_params[2], "r2", 32, PARAM_IN_OUT); - buf_set_u32(reg_params[2].value, 0, 32, 0xff); - - if ((retval = target->type->run_algorithm(target, 0, NULL, 3, reg_params, erase_check_algorithm->address, - erase_check_algorithm->address + sizeof(erase_check_code) - 2, 10000, &arm_info)) != ERROR_OK) - break; - - if (buf_get_u32(reg_params[2].value, 0, 32) == 0xff) - bank->sectors[i].is_erased = 1; - else - bank->sectors[i].is_erased = 0; - - destroy_reg_param(®_params[0]); - destroy_reg_param(®_params[1]); - destroy_reg_param(®_params[2]); + chunk = (j - bank->sectors[i].size); } - if (i == bank->num_sectors) + + retval = target->type->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++) { - fast_check = 1; + if (buffer[nBytes] != 0xFF) + { + bank->sectors[i].is_erased = 0; + break; + } } - } - target_free_working_area(target, erase_check_algorithm); + } } -#endif - if (!fast_check) + + return ERROR_OK; +} + +int default_flash_blank_check(struct flash_bank_s *bank) +{ + target_t *target = bank->target; + int i; + int retval; + int fast_check = 0; + int blank; + + if (bank->target->state != TARGET_HALTED) { - /* try ARM7 instead */ - - u32 erase_check_code[] = - { - 0xe4d03001, /* ldrb r3, [r0], #1 */ - 0xe0022003, /* and r2, r2, r3 */ - 0xe2511001, /* subs r1, r1, #1 */ - 0x1afffffb, /* b -4 */ - 0xeafffffe /* b 0 */ - }; - - /* make sure we have a working area */ - if (target_alloc_working_area(target, 20, &erase_check_algorithm) == ERROR_OK) - { - u8 erase_check_code_buf[5 * 4]; + LOG_ERROR("Target not halted"); + return ERROR_TARGET_NOT_HALTED; + } - for (i = 0; i < 5; i++) - target_buffer_set_u32(target, erase_check_code_buf + (i*4), erase_check_code[i]); + for (i = 0; i < bank->num_sectors; i++) + { + u32 address = bank->base + bank->sectors[i].offset; + u32 size = bank->sectors[i].size; - /* write algorithm code to working area */ - if ((retval=target->type->write_memory(target, erase_check_algorithm->address, 4, 5, erase_check_code_buf))==ERROR_OK) - { - for (i = 0; i < bank->num_sectors; i++) - { - u32 address = bank->base + bank->sectors[i].offset; - u32 size = bank->sectors[i].size; - - reg_param_t reg_params[3]; - armv4_5_algorithm_t armv4_5_info; - - armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC; - armv4_5_info.core_mode = ARMV4_5_MODE_SVC; - armv4_5_info.core_state = ARMV4_5_STATE_ARM; - - init_reg_param(®_params[0], "r0", 32, PARAM_OUT); - buf_set_u32(reg_params[0].value, 0, 32, address); - - init_reg_param(®_params[1], "r1", 32, PARAM_OUT); - buf_set_u32(reg_params[1].value, 0, 32, size); - - init_reg_param(®_params[2], "r2", 32, PARAM_IN_OUT); - buf_set_u32(reg_params[2].value, 0, 32, 0xff); - - if ((retval = target->type->run_algorithm(target, 0, NULL, 3, reg_params, - erase_check_algorithm->address, erase_check_algorithm->address + 0x10, 10000, &armv4_5_info)) != ERROR_OK) - break; - - if (buf_get_u32(reg_params[2].value, 0, 32) == 0xff) - bank->sectors[i].is_erased = 1; - else - bank->sectors[i].is_erased = 0; - - destroy_reg_param(®_params[0]); - destroy_reg_param(®_params[1]); - destroy_reg_param(®_params[2]); - } - if (i == bank->num_sectors) - { - fast_check = 1; - } - } - target_free_working_area(target, erase_check_algorithm); + 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 (!fast_check) { LOG_USER("Running slow fallback erase check - add working memory"); - for (i = 0; i < bank->num_sectors; i++) - { - int j; - bank->sectors[i].is_erased = 1; - - for (j=0; jsectors[i].size; j+=buffer_size) - { - int 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); - if (retval!=ERROR_OK) - return retval; - - for (nBytes = 0; nBytes < chunk; nBytes++) - { - if (buffer[nBytes] != 0xFF) - { - bank->sectors[i].is_erased = 0; - break; - } - } - } - } + return default_flash_mem_blank_check(bank); } - + return ERROR_OK; }