X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnor%2Ffm3.c;h=09ce3173822733bd52c66a4cc1569c7ddefc84e8;hb=5175f8be3318d13931a319885cf6e5560329e324;hp=583ba22c4ec1fb7db80710e48cbc50ebd6eccfd1;hpb=908ee4dc9641bd3df2eb00264575501867da539d;p=openocd.git diff --git a/src/flash/nor/fm3.c b/src/flash/nor/fm3.c index 583ba22c4e..09ce317382 100644 --- a/src/flash/nor/fm3.c +++ b/src/flash/nor/fm3.c @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ #ifdef HAVE_CONFIG_H @@ -38,12 +38,17 @@ enum fm3_variant { mb9bfxx4, mb9bfxx5, mb9bfxx6, + mb9bfxx7, + mb9bfxx8, + mb9afxx1, /* Flash Type '2' */ mb9afxx2, mb9afxx3, mb9afxx4, mb9afxx5, - mb9afxx6 + mb9afxx6, + mb9afxx7, + mb9afxx8, }; enum fm3_flash_type { @@ -53,7 +58,6 @@ enum fm3_flash_type { }; struct fm3_flash_bank { - struct working_area *write_algorithm; enum fm3_variant variant; enum fm3_flash_type flashtype; int probed; @@ -88,6 +92,12 @@ FLASH_BANK_COMMAND_HANDLER(fm3_flash_bank_command) } else if (strcmp(CMD_ARGV[5], "mb9bfxx6.cpu") == 0) { fm3_info->variant = mb9bfxx6; fm3_info->flashtype = fm3_flash_type1; + } else if (strcmp(CMD_ARGV[5], "mb9bfxx7.cpu") == 0) { + fm3_info->variant = mb9bfxx7; + fm3_info->flashtype = fm3_flash_type1; + } else if (strcmp(CMD_ARGV[5], "mb9bfxx8.cpu") == 0) { + fm3_info->variant = mb9bfxx8; + fm3_info->flashtype = fm3_flash_type1; } else if (strcmp(CMD_ARGV[5], "mb9afxx1.cpu") == 0) { /* Flash type '2' */ fm3_info->variant = mb9afxx1; fm3_info->flashtype = fm3_flash_type2; @@ -106,6 +116,12 @@ FLASH_BANK_COMMAND_HANDLER(fm3_flash_bank_command) } else if (strcmp(CMD_ARGV[5], "mb9afxx6.cpu") == 0) { fm3_info->variant = mb9afxx6; fm3_info->flashtype = fm3_flash_type2; + } else if (strcmp(CMD_ARGV[5], "mb9afxx7.cpu") == 0) { + fm3_info->variant = mb9afxx7; + fm3_info->flashtype = fm3_flash_type2; + } else if (strcmp(CMD_ARGV[5], "mb9afxx8.cpu") == 0) { + fm3_info->variant = mb9afxx8; + fm3_info->flashtype = fm3_flash_type2; } /* unknown Flash type */ @@ -115,7 +131,6 @@ FLASH_BANK_COMMAND_HANDLER(fm3_flash_bank_command) return ERROR_FLASH_BANK_INVALID; } - fm3_info->write_algorithm = NULL; fm3_info->probed = 0; return ERROR_OK; @@ -180,7 +195,7 @@ static int fm3_busy_wait(struct target *target, uint32_t offset, int timeout_ms) } if (retval == ERROR_OK) - LOG_DEBUG("fm3_busy_wait(%x) needs about %d ms", offset, ms); + LOG_DEBUG("fm3_busy_wait(%" PRIx32 ") needs about %d ms", offset, ms); return retval; } @@ -214,7 +229,7 @@ static int fm3_erase(struct flash_bank *bank, int first, int last) return ERROR_TARGET_NOT_HALTED; } - LOG_INFO("Fujitsu MB9Bxxx: Sector Erase ... (%d to %d)", first, last); + LOG_INFO("Fujitsu MB9[A/B]FXXX: Sector Erase ... (%d to %d)", first, last); /* FASZR = 0x01, Enables CPU Programming Mode (16-bit Flash acccess) */ retval = target_write_u32(target, 0x40000000, 0x0001); @@ -281,7 +296,8 @@ static int fm3_write_block(struct flash_bank *bank, uint8_t *buffer, { struct fm3_flash_bank *fm3_info = bank->driver_priv; struct target *target = bank->target; - uint32_t buffer_size = 2048; /* 8192 for MB9Bxx6! */ + uint32_t buffer_size = 2048; /* Default minimum value */ + struct working_area *write_algorithm; struct working_area *source; uint32_t address = bank->base + offset; struct reg_param reg_params[6]; @@ -291,6 +307,10 @@ static int fm3_write_block(struct flash_bank *bank, uint8_t *buffer, uint32_t u32FlashSeqAddress1; uint32_t u32FlashSeqAddress2; + /* Increase buffer_size if needed */ + if (buffer_size < (target->working_area_size / 2)) + buffer_size = (target->working_area_size / 2); + u32FlashType = (uint32_t) fm3_info->flashtype; if (u32FlashType == fm3_flash_type1) { @@ -430,13 +450,14 @@ static int fm3_write_block(struct flash_bank *bank, uint8_t *buffer, 0x00, 0xBE, /* BKPT #0 */ /* The following address pointers assume, that the code is running from */ - /* address 0x1FFF8008. These address pointers will be patched, if a */ + /* SRAM basic-address + 8.These address pointers will be patched, if a */ /* different start address in RAM is used (e.g. for Flash type 2)! */ - 0x00, 0x80, 0xFF, 0x1F, /* u32DummyRead address in RAM (0x1FFF8000) */ - 0x04, 0x80, 0xFF, 0x1F /* u32FlashResult address in RAM (0x1FFF8004) */ + /* Default SRAM basic-address is 0x20000000. */ + 0x00, 0x00, 0x00, 0x20, /* u32DummyRead address in RAM (0x20000000) */ + 0x04, 0x00, 0x00, 0x20 /* u32FlashResult address in RAM (0x20000004) */ }; - LOG_INFO("Fujitsu MB9B500: FLASH Write ..."); + LOG_INFO("Fujitsu MB9[A/B]FXXX: FLASH Write ..."); /* disable HW watchdog */ retval = target_write_u32(target, 0x40011C00, 0x1ACCE551); @@ -459,27 +480,38 @@ static int fm3_write_block(struct flash_bank *bank, uint8_t *buffer, return ERROR_FLASH_DST_BREAKS_ALIGNMENT; } - /* allocate working area with flash programming code */ - if (target_alloc_working_area(target, sizeof(fm3_flash_write_code), - &fm3_info->write_algorithm) != ERROR_OK) { + /* allocate working area and variables with flash programming code */ + if (target_alloc_working_area(target, sizeof(fm3_flash_write_code) + 8, + &write_algorithm) != ERROR_OK) { LOG_WARNING("no working area available, can't do block memory writes"); return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; } - retval = target_write_buffer(target, fm3_info->write_algorithm->address, + retval = target_write_buffer(target, write_algorithm->address + 8, sizeof(fm3_flash_write_code), fm3_flash_write_code); if (retval != ERROR_OK) return retval; + /* Patching 'local variable address' */ + /* Algorithm: u32DummyRead: */ + retval = target_write_u32(target, (write_algorithm->address + 8) + + sizeof(fm3_flash_write_code) - 8, (write_algorithm->address)); + if (retval != ERROR_OK) + return retval; + /* Algorithm: u32FlashResult: */ + retval = target_write_u32(target, (write_algorithm->address + 8) + + sizeof(fm3_flash_write_code) - 4, (write_algorithm->address) + 4); + if (retval != ERROR_OK) + return retval; + /* memory buffer */ while (target_alloc_working_area(target, buffer_size, &source) != ERROR_OK) { buffer_size /= 2; if (buffer_size <= 256) { - /* free working area, if write algorithm already allocated */ - if (fm3_info->write_algorithm) - target_free_working_area(target, fm3_info->write_algorithm); + /* free working area, write algorithm already allocated */ + target_free_working_area(target, write_algorithm); LOG_WARNING("No large enough working area available, can't do block memory writes"); return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; @@ -487,7 +519,7 @@ static int fm3_write_block(struct flash_bank *bank, uint8_t *buffer, } armv7m_info.common_magic = ARMV7M_COMMON_MAGIC; - armv7m_info.core_mode = ARMV7M_MODE_ANY; + armv7m_info.core_mode = ARM_MODE_THREAD; init_reg_param(®_params[0], "r0", 32, PARAM_OUT); /* source start address */ init_reg_param(®_params[1], "r1", 32, PARAM_OUT); /* target start address */ @@ -501,26 +533,6 @@ static int fm3_write_block(struct flash_bank *bank, uint8_t *buffer, while (count > 0) { uint32_t thisrun_count = (count > (buffer_size / 2)) ? (buffer_size / 2) : count; - retval = target_write_buffer(target, fm3_info->write_algorithm->address, 8, - fm3_flash_write_code); - if (retval != ERROR_OK) - break; - - /* Patching 'local variable address' for different RAM addresses */ - if (fm3_info->write_algorithm->address != 0x1FFF8008) { - /* Algorithm: u32DummyRead: */ - retval = target_write_u32(target, (fm3_info->write_algorithm->address) - + sizeof(fm3_flash_write_code) - 8, (fm3_info->write_algorithm->address) - 8); - if (retval != ERROR_OK) - break; - - /* Algorithm: u32FlashResult: */ - retval = target_write_u32(target, (fm3_info->write_algorithm->address) - + sizeof(fm3_flash_write_code) - 4, (fm3_info->write_algorithm->address) - 4); - if (retval != ERROR_OK) - break; - } - retval = target_write_buffer(target, source->address, thisrun_count * 2, buffer); if (retval != ERROR_OK) break; @@ -532,7 +544,7 @@ static int fm3_write_block(struct flash_bank *bank, uint8_t *buffer, buf_set_u32(reg_params[4].value, 0, 32, u32FlashSeqAddress2); retval = target_run_algorithm(target, 0, NULL, 6, reg_params, - fm3_info->write_algorithm->address, 0, 1000, &armv7m_info); + (write_algorithm->address + 8), 0, 1000, &armv7m_info); if (retval != ERROR_OK) { LOG_ERROR("Error executing fm3 Flash programming algorithm"); retval = ERROR_FLASH_OPERATION_FAILED; @@ -540,7 +552,7 @@ static int fm3_write_block(struct flash_bank *bank, uint8_t *buffer, } if (buf_get_u32(reg_params[5].value, 0, 32) != ERROR_OK) { - LOG_ERROR("Fujitsu MB9[A/B]FXXX: Flash programming ERROR (Timeout) -> Reg R3: %x", + LOG_ERROR("Fujitsu MB9[A/B]FXXX: Flash programming ERROR (Timeout) -> Reg R3: %" PRIx32, buf_get_u32(reg_params[5].value, 0, 32)); retval = ERROR_FLASH_OPERATION_FAILED; break; @@ -552,7 +564,7 @@ static int fm3_write_block(struct flash_bank *bank, uint8_t *buffer, } target_free_working_area(target, source); - target_free_working_area(target, fm3_info->write_algorithm); + target_free_working_area(target, write_algorithm); destroy_reg_param(®_params[0]); destroy_reg_param(®_params[1]); @@ -574,7 +586,22 @@ static int fm3_probe(struct flash_bank *bank) return ERROR_TARGET_NOT_HALTED; } - num_pages = 6; /* max number of Flash pages for malloc */ +/* + -- page-- start -- blocksize - mpu - totalFlash -- + page0 0x00000 16k + page1 0x04000 16k + page2 0x08000 96k ___ fxx3 128k Flash + page3 0x20000 128k ___ fxx4 256k Flash + page4 0x40000 128k ___ fxx5 384k Flash + page5 0x60000 128k ___ fxx6 512k Flash +----------------------- + page6 0x80000 128k + page7 0xa0000 128k ___ fxx7 256k Flash + page8 0xc0000 128k + page9 0xe0000 128k ___ fxx8 256k Flash + */ + + num_pages = 10; /* max number of Flash pages for malloc */ fm3_info->probed = 0; bank->sectors = malloc(sizeof(struct flash_sector) * num_pages); @@ -607,10 +634,14 @@ static int fm3_probe(struct flash_bank *bank) || (fm3_info->variant == mb9bfxx4) || (fm3_info->variant == mb9bfxx5) || (fm3_info->variant == mb9bfxx6) + || (fm3_info->variant == mb9bfxx7) + || (fm3_info->variant == mb9bfxx8) || (fm3_info->variant == mb9afxx2) || (fm3_info->variant == mb9afxx4) || (fm3_info->variant == mb9afxx5) - || (fm3_info->variant == mb9afxx6)) { + || (fm3_info->variant == mb9afxx6) + || (fm3_info->variant == mb9afxx7) + || (fm3_info->variant == mb9afxx8)) { num_pages = 3; bank->size = 128 * 1024; /* bytes */ bank->num_sectors = num_pages; @@ -624,9 +655,13 @@ static int fm3_probe(struct flash_bank *bank) if ((fm3_info->variant == mb9bfxx4) || (fm3_info->variant == mb9bfxx5) || (fm3_info->variant == mb9bfxx6) + || (fm3_info->variant == mb9bfxx7) + || (fm3_info->variant == mb9bfxx8) || (fm3_info->variant == mb9afxx4) || (fm3_info->variant == mb9afxx5) - || (fm3_info->variant == mb9afxx6)) { + || (fm3_info->variant == mb9afxx6) + || (fm3_info->variant == mb9afxx7) + || (fm3_info->variant == mb9afxx8)) { num_pages = 4; bank->size = 256 * 1024; /* bytes */ bank->num_sectors = num_pages; @@ -639,8 +674,12 @@ static int fm3_probe(struct flash_bank *bank) if ((fm3_info->variant == mb9bfxx5) || (fm3_info->variant == mb9bfxx6) + || (fm3_info->variant == mb9bfxx7) + || (fm3_info->variant == mb9bfxx8) || (fm3_info->variant == mb9afxx5) - || (fm3_info->variant == mb9afxx6)) { + || (fm3_info->variant == mb9afxx6) + || (fm3_info->variant == mb9afxx7) + || (fm3_info->variant == mb9afxx8)) { num_pages = 5; bank->size = 384 * 1024; /* bytes */ bank->num_sectors = num_pages; @@ -652,7 +691,11 @@ static int fm3_probe(struct flash_bank *bank) } if ((fm3_info->variant == mb9bfxx6) - || (fm3_info->variant == mb9afxx6)) { + || (fm3_info->variant == mb9bfxx7) + || (fm3_info->variant == mb9bfxx8) + || (fm3_info->variant == mb9afxx6) + || (fm3_info->variant == mb9afxx7) + || (fm3_info->variant == mb9afxx8)) { num_pages = 6; bank->size = 512 * 1024; /* bytes */ bank->num_sectors = num_pages; @@ -663,6 +706,42 @@ static int fm3_probe(struct flash_bank *bank) bank->sectors[5].is_protected = -1; } + if ((fm3_info->variant == mb9bfxx7) + || (fm3_info->variant == mb9bfxx8) + || (fm3_info->variant == mb9afxx7) + || (fm3_info->variant == mb9afxx8)) { + num_pages = 8; + bank->size = 768 * 1024; /* bytes */ + bank->num_sectors = num_pages; + + bank->sectors[6].offset = 0x80000; + bank->sectors[6].size = 128 * 1024; + bank->sectors[6].is_erased = -1; + bank->sectors[6].is_protected = -1; + + bank->sectors[7].offset = 0xa0000; + bank->sectors[7].size = 128 * 1024; + bank->sectors[7].is_erased = -1; + bank->sectors[7].is_protected = -1; + } + + if ((fm3_info->variant == mb9bfxx8) + || (fm3_info->variant == mb9afxx8)) { + num_pages = 10; + bank->size = 1024 * 1024; /* bytes */ + bank->num_sectors = num_pages; + + bank->sectors[8].offset = 0xc0000; + bank->sectors[8].size = 128 * 1024; + bank->sectors[8].is_erased = -1; + bank->sectors[8].is_protected = -1; + + bank->sectors[9].offset = 0xe0000; + bank->sectors[9].size = 128 * 1024; + bank->sectors[9].is_erased = -1; + bank->sectors[9].is_protected = -1; + } + fm3_info->probed = 1; return ERROR_OK; @@ -676,12 +755,6 @@ static int fm3_auto_probe(struct flash_bank *bank) return fm3_probe(bank); } -static int fm3_info(struct flash_bank *bank, char *buf, int buf_size) -{ - snprintf(buf, buf_size, "Fujitsu fm3 Device does not support Chip-ID (Type unknown)"); - return ERROR_OK; -} - /* Chip erase */ static int fm3_chip_erase(struct flash_bank *bank) { @@ -713,9 +786,7 @@ static int fm3_chip_erase(struct flash_bank *bank) return ERROR_TARGET_NOT_HALTED; } - LOG_INFO("Fujitsu MB9[AB]xxx: Chip Erase ... (may take several seconds)"); - - /* Implement Flash chip erase (mass erase) completely on host */ + LOG_INFO("Fujitsu MB9[A/B]xxx: Chip Erase ... (may take several seconds)"); /* FASZR = 0x01, Enables CPU Programming Mode (16-bit Flash access) */ retval = target_write_u32(target, 0x40000000, 0x0001); @@ -822,6 +893,5 @@ struct flash_driver fm3_flash = { .write = fm3_write_block, .probe = fm3_probe, .auto_probe = fm3_auto_probe, - .erase_check = default_flash_mem_blank_check, - .info = fm3_info, + .erase_check = default_flash_blank_check, };