X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fstr9x.c;h=bae895d2240d635fdb3daa45a82acc10fb318074;hp=828fad3cd40f9c0163552e97e2b1190d55d1bcc6;hb=15e8e4530866454c18c5d91ad9e867f339c2e82b;hpb=f876d5e9c769a288faa7fd14b7bf373363542aab diff --git a/src/flash/str9x.c b/src/flash/str9x.c index 828fad3cd4..bae895d224 100644 --- a/src/flash/str9x.c +++ b/src/flash/str9x.c @@ -31,53 +31,16 @@ #include "arm966e.h" -static u32 bank1start = 0x00080000; - -static int str9x_register_commands(struct command_context_s *cmd_ctx); -static int str9x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); -static int str9x_erase(struct flash_bank_s *bank, int first, int last); -static int str9x_protect(struct flash_bank_s *bank, int set, int first, int last); -static int str9x_write(struct flash_bank_s *bank, uint8_t *buffer, u32 offset, u32 count); -static int str9x_probe(struct flash_bank_s *bank); -//static int str9x_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int str9x_protect_check(struct flash_bank_s *bank); -static int str9x_info(struct flash_bank_s *bank, char *buf, int buf_size); - -static int str9x_handle_flash_config_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); - -flash_driver_t str9x_flash = -{ - .name = "str9x", - .register_commands = str9x_register_commands, - .flash_bank_command = str9x_flash_bank_command, - .erase = str9x_erase, - .protect = str9x_protect, - .write = str9x_write, - .probe = str9x_probe, - .auto_probe = str9x_probe, - .erase_check = default_flash_blank_check, - .protect_check = str9x_protect_check, - .info = str9x_info -}; - -static int str9x_register_commands(struct command_context_s *cmd_ctx) -{ - command_t *str9x_cmd = register_command(cmd_ctx, NULL, "str9x", NULL, COMMAND_ANY, NULL); - - register_command(cmd_ctx, str9x_cmd, "flash_config", str9x_handle_flash_config_command, COMMAND_EXEC, - "configure str9 flash controller"); - - return ERROR_OK; -} +static uint32_t bank1start = 0x00080000; static int str9x_build_block_list(struct flash_bank_s *bank) { - str9x_flash_bank_t *str9x_info = bank->driver_priv; + struct str9x_flash_bank *str9x_info = bank->driver_priv; int i; int num_sectors; int b0_sectors = 0, b1_sectors = 0; - u32 offset = 0; + uint32_t offset = 0; /* set if we have large flash str9 */ str9x_info->variant = 0; @@ -120,8 +83,8 @@ static int str9x_build_block_list(struct flash_bank_s *bank) num_sectors = b0_sectors + b1_sectors; bank->num_sectors = num_sectors; - bank->sectors = malloc(sizeof(flash_sector_t) * num_sectors); - str9x_info->sector_bits = malloc(sizeof(u32) * num_sectors); + bank->sectors = malloc(sizeof(struct flash_sector) * num_sectors); + str9x_info->sector_bits = malloc(sizeof(uint32_t) * num_sectors); num_sectors = 0; @@ -132,7 +95,7 @@ static int str9x_build_block_list(struct flash_bank_s *bank) offset += bank->sectors[i].size; bank->sectors[num_sectors].is_erased = -1; bank->sectors[num_sectors].is_protected = 1; - str9x_info->sector_bits[num_sectors++] = (1<sector_bits[num_sectors++] = (1 << i); } for (i = 0; i < b1_sectors; i++) @@ -143,9 +106,9 @@ static int str9x_build_block_list(struct flash_bank_s *bank) bank->sectors[num_sectors].is_erased = -1; bank->sectors[num_sectors].is_protected = 1; if (str9x_info->variant) - str9x_info->sector_bits[num_sectors++] = (1<sector_bits[num_sectors++] = (1 << i); else - str9x_info->sector_bits[num_sectors++] = (1<<(i+8)); + str9x_info->sector_bits[num_sectors++] = (1 << (i + 8)); } return ERROR_OK; @@ -153,10 +116,9 @@ static int str9x_build_block_list(struct flash_bank_s *bank) /* flash bank str9x 0 0 */ -static int str9x_flash_bank_command(struct command_context_s *cmd_ctx, - char *cmd, char **args, int argc, struct flash_bank_s *bank) +FLASH_BANK_COMMAND_HANDLER(str9x_flash_bank_command) { - str9x_flash_bank_t *str9x_info; + struct str9x_flash_bank *str9x_info; if (argc < 6) { @@ -164,7 +126,7 @@ static int str9x_flash_bank_command(struct command_context_s *cmd_ctx, return ERROR_FLASH_BANK_INVALID; } - str9x_info = malloc(sizeof(str9x_flash_bank_t)); + str9x_info = malloc(sizeof(struct str9x_flash_bank)); bank->driver_priv = str9x_info; str9x_build_block_list(bank); @@ -177,12 +139,12 @@ static int str9x_flash_bank_command(struct command_context_s *cmd_ctx, static int str9x_protect_check(struct flash_bank_s *bank) { int retval; - str9x_flash_bank_t *str9x_info = bank->driver_priv; + struct str9x_flash_bank *str9x_info = bank->driver_priv; target_t *target = bank->target; int i; - u32 adr; - u32 status = 0; + uint32_t adr; + uint32_t status = 0; uint16_t hstatus = 0; if (bank->target->state != TARGET_HALTED) @@ -198,11 +160,11 @@ static int str9x_protect_check(struct flash_bank_s *bank) if (str9x_info->bank1) { adr = bank1start + 0x18; - if ((retval=target_write_u16(target, adr, 0x90))!=ERROR_OK) + if ((retval = target_write_u16(target, adr, 0x90)) != ERROR_OK) { return retval; } - if ((retval=target_read_u16(target, adr, &hstatus))!=ERROR_OK) + if ((retval = target_read_u16(target, adr, &hstatus)) != ERROR_OK) { return retval; } @@ -211,11 +173,11 @@ static int str9x_protect_check(struct flash_bank_s *bank) else { adr = bank1start + 0x14; - if ((retval=target_write_u16(target, adr, 0x90))!=ERROR_OK) + if ((retval = target_write_u16(target, adr, 0x90)) != ERROR_OK) { return retval; } - if ((retval=target_read_u32(target, adr, &status))!=ERROR_OK) + if ((retval = target_read_u32(target, adr, &status)) != ERROR_OK) { return retval; } @@ -224,11 +186,11 @@ static int str9x_protect_check(struct flash_bank_s *bank) else { adr = bank1start + 0x10; - if ((retval=target_write_u16(target, adr, 0x90))!=ERROR_OK) + if ((retval = target_write_u16(target, adr, 0x90)) != ERROR_OK) { return retval; } - if ((retval=target_read_u16(target, adr, &hstatus))!=ERROR_OK) + if ((retval = target_read_u16(target, adr, &hstatus)) != ERROR_OK) { return retval; } @@ -236,7 +198,7 @@ static int str9x_protect_check(struct flash_bank_s *bank) } /* read array command */ - if ((retval=target_write_u16(target, adr, 0xFF))!=ERROR_OK) + if ((retval = target_write_u16(target, adr, 0xFF)) != ERROR_OK) { return retval; } @@ -256,7 +218,7 @@ static int str9x_erase(struct flash_bank_s *bank, int first, int last) { target_t *target = bank->target; int i; - u32 adr; + uint32_t adr; uint8_t status; uint8_t erase_cmd; @@ -284,50 +246,50 @@ static int str9x_erase(struct flash_bank_s *bank, int first, int last) adr = bank->base + bank->sectors[i].offset; /* erase sectors */ - if ((retval=target_write_u16(target, adr, erase_cmd))!=ERROR_OK) + if ((retval = target_write_u16(target, adr, erase_cmd)) != ERROR_OK) { return retval; } - if ((retval=target_write_u16(target, adr, 0xD0))!=ERROR_OK) + if ((retval = target_write_u16(target, adr, 0xD0)) != ERROR_OK) { return retval; } /* get status */ - if ((retval=target_write_u16(target, adr, 0x70))!=ERROR_OK) + if ((retval = target_write_u16(target, adr, 0x70)) != ERROR_OK) { return retval; } int timeout; - for (timeout=0; timeout<1000; timeout++) { - if ((retval=target_read_u8(target, adr, &status))!=ERROR_OK) + for (timeout = 0; timeout < 1000; timeout++) { + if ((retval = target_read_u8(target, adr, &status)) != ERROR_OK) { return retval; } - if( status & 0x80 ) + if (status & 0x80) break; alive_sleep(1); } - if (timeout==1000) + if (timeout == 1000) { LOG_ERROR("erase timed out"); return ERROR_FAIL; } /* clear status, also clear read array */ - if ((retval=target_write_u16(target, adr, 0x50))!=ERROR_OK) + if ((retval = target_write_u16(target, adr, 0x50)) != ERROR_OK) { return retval; } /* read array command */ - if ((retval=target_write_u16(target, adr, 0xFF))!=ERROR_OK) + if ((retval = target_write_u16(target, adr, 0xFF)) != ERROR_OK) { return retval; } - if( status & 0x22 ) + if (status & 0x22) { LOG_ERROR("error erasing flash bank, status: 0x%x", status); return ERROR_FLASH_OPERATION_FAILED; @@ -349,7 +311,7 @@ static int str9x_protect(struct flash_bank_s *bank, { target_t *target = bank->target; int i; - u32 adr; + uint32_t adr; uint8_t status; if (bank->target->state != TARGET_HALTED) @@ -365,7 +327,7 @@ static int str9x_protect(struct flash_bank_s *bank, adr = bank->base + bank->sectors[i].offset; target_write_u16(target, adr, 0x60); - if( set ) + if (set) target_write_u16(target, adr, 0x01); else target_write_u16(target, adr, 0xD0); @@ -384,18 +346,18 @@ static int str9x_protect(struct flash_bank_s *bank, } static int str9x_write_block(struct flash_bank_s *bank, - uint8_t *buffer, u32 offset, u32 count) + uint8_t *buffer, uint32_t offset, uint32_t count) { - str9x_flash_bank_t *str9x_info = bank->driver_priv; + struct str9x_flash_bank *str9x_info = bank->driver_priv; target_t *target = bank->target; - u32 buffer_size = 8192; + uint32_t buffer_size = 8192; working_area_t *source; - u32 address = bank->base + offset; - reg_param_t reg_params[4]; - armv4_5_algorithm_t armv4_5_info; + uint32_t address = bank->base + offset; + struct reg_param reg_params[4]; + struct armv4_5_algorithm armv4_5_info; int retval = ERROR_OK; - u32 str9x_flash_write_code[] = { + uint32_t str9x_flash_write_code[] = { /* write: */ 0xe3c14003, /* bic r4, r1, #3 */ 0xe3a03040, /* mov r3, #0x40 */ @@ -455,7 +417,7 @@ static int str9x_write_block(struct flash_bank_s *bank, while (count > 0) { - u32 thisrun_count = (count > (buffer_size / 2)) ? (buffer_size / 2) : count; + uint32_t thisrun_count = (count > (buffer_size / 2)) ? (buffer_size / 2) : count; target_write_buffer(target, source->address, thisrun_count * 2, buffer); @@ -493,17 +455,17 @@ static int str9x_write_block(struct flash_bank_s *bank, } static int str9x_write(struct flash_bank_s *bank, - uint8_t *buffer, u32 offset, u32 count) + uint8_t *buffer, uint32_t offset, uint32_t count) { target_t *target = bank->target; - u32 words_remaining = (count / 2); - u32 bytes_remaining = (count & 0x00000001); - u32 address = bank->base + offset; - u32 bytes_written = 0; + uint32_t words_remaining = (count / 2); + uint32_t bytes_remaining = (count & 0x00000001); + uint32_t address = bank->base + offset; + uint32_t bytes_written = 0; uint8_t status; int retval; - u32 check_address = offset; - u32 bank_adr; + uint32_t check_address = offset; + uint32_t bank_adr; int i; if (bank->target->state != TARGET_HALTED) @@ -514,14 +476,14 @@ static int str9x_write(struct flash_bank_s *bank, if (offset & 0x1) { - LOG_WARNING("offset 0x%x breaks required 2-byte alignment", offset); + LOG_WARNING("offset 0x%" PRIx32 " breaks required 2-byte alignment", offset); return ERROR_FLASH_DST_BREAKS_ALIGNMENT; } for (i = 0; i < bank->num_sectors; i++) { - u32 sec_start = bank->sectors[i].offset; - u32 sec_end = sec_start + bank->sectors[i].size; + uint32_t sec_start = bank->sectors[i].offset; + uint32_t sec_end = sec_start + bank->sectors[i].size; /* check if destination falls within the current sector */ if ((check_address >= sec_start) && (check_address < sec_end)) @@ -575,14 +537,14 @@ static int str9x_write(struct flash_bank_s *bank, target_write_u16(target, bank_adr, 0x70); int timeout; - for (timeout=0; timeout<1000; timeout++) + for (timeout = 0; timeout < 1000; timeout++) { target_read_u8(target, bank_adr, &status); - if( status & 0x80 ) + if (status & 0x80) break; alive_sleep(1); } - if (timeout==1000) + if (timeout == 1000) { LOG_ERROR("write timed out"); return ERROR_FAIL; @@ -607,7 +569,7 @@ static int str9x_write(struct flash_bank_s *bank, uint8_t last_halfword[2] = {0xff, 0xff}; int i = 0; - while(bytes_remaining > 0) + while (bytes_remaining > 0) { last_halfword[i++] = *(buffer + bytes_written); bytes_remaining--; @@ -624,14 +586,14 @@ static int str9x_write(struct flash_bank_s *bank, target_write_u16(target, bank_adr, 0x70); int timeout; - for (timeout=0; timeout<1000; timeout++) + for (timeout = 0; timeout < 1000; timeout++) { target_read_u8(target, bank_adr, &status); - if( status & 0x80 ) + if (status & 0x80) break; alive_sleep(1); } - if (timeout==1000) + if (timeout == 1000) { LOG_ERROR("write timed out"); return ERROR_FAIL; @@ -656,8 +618,7 @@ static int str9x_probe(struct flash_bank_s *bank) } #if 0 -static int str9x_handle_part_id_command(struct command_context_s *cmd_ctx, - char *cmd, char **args, int argc) +COMMAND_HANDLER(str9x_handle_part_id_command) { return ERROR_OK; } @@ -665,15 +626,13 @@ static int str9x_handle_part_id_command(struct command_context_s *cmd_ctx, static int str9x_info(struct flash_bank_s *bank, char *buf, int buf_size) { - snprintf(buf, buf_size, "str9x flash driver info" ); + snprintf(buf, buf_size, "str9x flash driver info"); return ERROR_OK; } -static int str9x_handle_flash_config_command(struct command_context_s *cmd_ctx, - char *cmd, char **args, int argc) +COMMAND_HANDLER(str9x_handle_flash_config_command) { - str9x_flash_bank_t *str9x_info; - flash_bank_t *bank; + struct str9x_flash_bank *str9x_info; target_t *target = NULL; if (argc < 5) @@ -681,12 +640,16 @@ static int str9x_handle_flash_config_command(struct command_context_s *cmd_ctx, return ERROR_COMMAND_SYNTAX_ERROR; } - bank = get_flash_bank_by_num(strtoul(args[0], NULL, 0)); - if (!bank) - { - command_print(cmd_ctx, "flash bank '#%s' is out of bounds", args[0]); - return ERROR_OK; - } + flash_bank_t *bank; + int retval = flash_command_get_bank_by_num(cmd_ctx, args[0], &bank); + if (ERROR_OK != retval) + return retval; + + uint32_t bbsr, nbbsr, bbadr, nbbadr; + COMMAND_PARSE_NUMBER(u32, args[1], bbsr); + COMMAND_PARSE_NUMBER(u32, args[2], nbbsr); + COMMAND_PARSE_NUMBER(u32, args[3], bbadr); + COMMAND_PARSE_NUMBER(u32, args[4], nbbadr); str9x_info = bank->driver_priv; @@ -699,10 +662,10 @@ static int str9x_handle_flash_config_command(struct command_context_s *cmd_ctx, } /* config flash controller */ - target_write_u32(target, FLASH_BBSR, strtoul(args[1], NULL, 0)); - target_write_u32(target, FLASH_NBBSR, strtoul(args[2], NULL, 0)); - target_write_u32(target, FLASH_BBADR, (strtoul(args[3], NULL, 0) >> 2)); - target_write_u32(target, FLASH_NBBADR, (strtoul(args[4], NULL, 0) >> 2)); + target_write_u32(target, FLASH_BBSR, bbsr); + target_write_u32(target, FLASH_NBBSR, nbbsr); + target_write_u32(target, FLASH_BBADR, bbadr >> 2); + target_write_u32(target, FLASH_NBBADR, nbbadr >> 2); /* set bit 18 instruction TCM order as per flash programming manual */ arm966e_write_cp15(target, 62, 0x40000); @@ -711,3 +674,29 @@ static int str9x_handle_flash_config_command(struct command_context_s *cmd_ctx, target_write_u32(target, FLASH_CR, 0x18); return ERROR_OK; } + +static int str9x_register_commands(struct command_context_s *cmd_ctx) +{ + command_t *str9x_cmd = register_command(cmd_ctx, NULL, "str9x", + NULL, COMMAND_ANY, "str9x flash commands"); + + register_command(cmd_ctx, str9x_cmd, "flash_config", + str9x_handle_flash_config_command, COMMAND_EXEC, + "configure str9 flash controller"); + + return ERROR_OK; +} + +struct flash_driver str9x_flash = { + .name = "str9x", + .register_commands = &str9x_register_commands, + .flash_bank_command = &str9x_flash_bank_command, + .erase = &str9x_erase, + .protect = &str9x_protect, + .write = &str9x_write, + .probe = &str9x_probe, + .auto_probe = &str9x_probe, + .erase_check = &default_flash_blank_check, + .protect_check = &str9x_protect_check, + .info = &str9x_info, + };