X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fstm32x.c;h=c628f1878cc029802c7d59d2aa3f5eab0805d1b3;hb=ccae9ae0200a66472409334d18108b309a9fae70;hp=b0d69767777333543b17c8c5b6eb48beabe2b12d;hpb=278ca633da5c7c2d1979129d7db912b1f4784d98;p=openocd.git diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c index b0d6976777..c628f1878c 100644 --- a/src/flash/stm32x.c +++ b/src/flash/stm32x.c @@ -27,71 +27,24 @@ #include "stm32x.h" #include "armv7m.h" #include "binarybuffer.h" +#include "algorithm.h" -static int stm32x_register_commands(struct command_context_s *cmd_ctx); -static int stm32x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank); -static int stm32x_erase(struct flash_bank_s *bank, int first, int last); -static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int last); -static int stm32x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count); -static int stm32x_probe(struct flash_bank_s *bank); -static int stm32x_auto_probe(struct flash_bank_s *bank); -//static int stm32x_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int stm32x_protect_check(struct flash_bank_s *bank); -static int stm32x_info(struct flash_bank_s *bank, char *buf, int buf_size); - -static int stm32x_handle_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int stm32x_handle_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int stm32x_handle_options_read_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int stm32x_handle_options_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int stm32x_handle_mass_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -static int stm32x_mass_erase(struct flash_bank_s *bank); - -flash_driver_t stm32x_flash = -{ - .name = "stm32x", - .register_commands = stm32x_register_commands, - .flash_bank_command = stm32x_flash_bank_command, - .erase = stm32x_erase, - .protect = stm32x_protect, - .write = stm32x_write, - .probe = stm32x_probe, - .auto_probe = stm32x_auto_probe, - .erase_check = default_flash_mem_blank_check, - .protect_check = stm32x_protect_check, - .info = stm32x_info -}; - -static int stm32x_register_commands(struct command_context_s *cmd_ctx) -{ - command_t *stm32x_cmd = register_command(cmd_ctx, NULL, "stm32x", NULL, COMMAND_ANY, "stm32x flash specific commands"); - - register_command(cmd_ctx, stm32x_cmd, "lock", stm32x_handle_lock_command, COMMAND_EXEC, - "lock device"); - register_command(cmd_ctx, stm32x_cmd, "unlock", stm32x_handle_unlock_command, COMMAND_EXEC, - "unlock protected device"); - register_command(cmd_ctx, stm32x_cmd, "mass_erase", stm32x_handle_mass_erase_command, COMMAND_EXEC, - "mass erase device"); - register_command(cmd_ctx, stm32x_cmd, "options_read", stm32x_handle_options_read_command, COMMAND_EXEC, - "read device option bytes"); - register_command(cmd_ctx, stm32x_cmd, "options_write", stm32x_handle_options_write_command, COMMAND_EXEC, - "write device option bytes"); - return ERROR_OK; -} +static int stm32x_mass_erase(struct flash_bank *bank); /* flash bank stm32x 0 0 */ -static int stm32x_flash_bank_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct flash_bank_s *bank) +FLASH_BANK_COMMAND_HANDLER(stm32x_flash_bank_command) { - stm32x_flash_bank_t *stm32x_info; + struct stm32x_flash_bank *stm32x_info; - if (argc < 6) + if (CMD_ARGC < 6) { LOG_WARNING("incomplete flash_bank stm32x configuration"); return ERROR_FLASH_BANK_INVALID; } - stm32x_info = malloc(sizeof(stm32x_flash_bank_t)); + stm32x_info = malloc(sizeof(struct stm32x_flash_bank)); bank->driver_priv = stm32x_info; stm32x_info->write_algorithm = NULL; @@ -100,47 +53,47 @@ static int stm32x_flash_bank_command(struct command_context_s *cmd_ctx, char *cm return ERROR_OK; } -static u32 stm32x_get_flash_status(flash_bank_t *bank) +static uint32_t stm32x_get_flash_status(struct flash_bank *bank) { - target_t *target = bank->target; - u32 status; + struct target *target = bank->target; + uint32_t status; target_read_u32(target, STM32_FLASH_SR, &status); return status; } -static u32 stm32x_wait_status_busy(flash_bank_t *bank, int timeout) +static uint32_t stm32x_wait_status_busy(struct flash_bank *bank, int timeout) { - target_t *target = bank->target; - u32 status; + struct target *target = bank->target; + uint32_t status; /* wait for busy to clear */ while (((status = stm32x_get_flash_status(bank)) & FLASH_BSY) && (timeout-- > 0)) { - LOG_DEBUG("status: 0x%x", status); + LOG_DEBUG("status: 0x%" PRIx32 "", status); alive_sleep(1); } /* Clear but report errors */ - if (status & (FLASH_WRPRTERR|FLASH_PGERR)) + if (status & (FLASH_WRPRTERR | FLASH_PGERR)) { - target_write_u32(target, STM32_FLASH_SR, FLASH_WRPRTERR|FLASH_PGERR); + target_write_u32(target, STM32_FLASH_SR, FLASH_WRPRTERR | FLASH_PGERR); } return status; } -static int stm32x_read_options(struct flash_bank_s *bank) +static int stm32x_read_options(struct flash_bank *bank) { - u32 optiondata; - stm32x_flash_bank_t *stm32x_info = NULL; - target_t *target = bank->target; + uint32_t optiondata; + struct stm32x_flash_bank *stm32x_info = NULL; + struct target *target = bank->target; stm32x_info = bank->driver_priv; /* read current option bytes */ target_read_u32(target, STM32_FLASH_OBR, &optiondata); - stm32x_info->option_bytes.user_options = (u16)0xFFF8|((optiondata >> 2) & 0x07); + stm32x_info->option_bytes.user_options = (uint16_t)0xFFF8 | ((optiondata >> 2) & 0x07); stm32x_info->option_bytes.RDP = (optiondata & (1 << OPT_READOUT)) ? 0xFFFF : 0x5AA5; if (optiondata & (1 << OPT_READOUT)) @@ -149,19 +102,19 @@ static int stm32x_read_options(struct flash_bank_s *bank) /* each bit refers to a 4bank protection */ target_read_u32(target, STM32_FLASH_WRPR, &optiondata); - stm32x_info->option_bytes.protection[0] = (u16)optiondata; - stm32x_info->option_bytes.protection[1] = (u16)(optiondata >> 8); - stm32x_info->option_bytes.protection[2] = (u16)(optiondata >> 16); - stm32x_info->option_bytes.protection[3] = (u16)(optiondata >> 24); + stm32x_info->option_bytes.protection[0] = (uint16_t)optiondata; + stm32x_info->option_bytes.protection[1] = (uint16_t)(optiondata >> 8); + stm32x_info->option_bytes.protection[2] = (uint16_t)(optiondata >> 16); + stm32x_info->option_bytes.protection[3] = (uint16_t)(optiondata >> 24); return ERROR_OK; } -static int stm32x_erase_options(struct flash_bank_s *bank) +static int stm32x_erase_options(struct flash_bank *bank) { - stm32x_flash_bank_t *stm32x_info = NULL; - target_t *target = bank->target; - u32 status; + struct stm32x_flash_bank *stm32x_info = NULL; + struct target *target = bank->target; + uint32_t status; stm32x_info = bank->driver_priv; @@ -177,14 +130,14 @@ static int stm32x_erase_options(struct flash_bank_s *bank) target_write_u32(target, STM32_FLASH_OPTKEYR, KEY2); /* erase option bytes */ - target_write_u32(target, STM32_FLASH_CR, FLASH_OPTER|FLASH_OPTWRE); - target_write_u32(target, STM32_FLASH_CR, FLASH_OPTER|FLASH_STRT|FLASH_OPTWRE); + target_write_u32(target, STM32_FLASH_CR, FLASH_OPTER | FLASH_OPTWRE); + target_write_u32(target, STM32_FLASH_CR, FLASH_OPTER | FLASH_STRT | FLASH_OPTWRE); status = stm32x_wait_status_busy(bank, 10); - if( status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) return ERROR_FLASH_OPERATION_FAILED; - if( status & FLASH_PGERR ) + if (status & FLASH_PGERR) return ERROR_FLASH_OPERATION_FAILED; /* clear readout protection and complementary option bytes @@ -194,11 +147,11 @@ static int stm32x_erase_options(struct flash_bank_s *bank) return ERROR_OK; } -static int stm32x_write_options(struct flash_bank_s *bank) +static int stm32x_write_options(struct flash_bank *bank) { - stm32x_flash_bank_t *stm32x_info = NULL; - target_t *target = bank->target; - u32 status; + struct stm32x_flash_bank *stm32x_info = NULL; + struct target *target = bank->target; + uint32_t status; stm32x_info = bank->driver_priv; @@ -211,16 +164,16 @@ static int stm32x_write_options(struct flash_bank_s *bank) target_write_u32(target, STM32_FLASH_OPTKEYR, KEY2); /* program option bytes */ - target_write_u32(target, STM32_FLASH_CR, FLASH_OPTPG|FLASH_OPTWRE); + target_write_u32(target, STM32_FLASH_CR, FLASH_OPTPG | FLASH_OPTWRE); /* write user option byte */ target_write_u16(target, STM32_OB_USER, stm32x_info->option_bytes.user_options); status = stm32x_wait_status_busy(bank, 10); - if( status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) return ERROR_FLASH_OPERATION_FAILED; - if( status & FLASH_PGERR ) + if (status & FLASH_PGERR) return ERROR_FLASH_OPERATION_FAILED; /* write protection byte 1 */ @@ -228,9 +181,9 @@ static int stm32x_write_options(struct flash_bank_s *bank) status = stm32x_wait_status_busy(bank, 10); - if( status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) return ERROR_FLASH_OPERATION_FAILED; - if( status & FLASH_PGERR ) + if (status & FLASH_PGERR) return ERROR_FLASH_OPERATION_FAILED; /* write protection byte 2 */ @@ -238,9 +191,9 @@ static int stm32x_write_options(struct flash_bank_s *bank) status = stm32x_wait_status_busy(bank, 10); - if( status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) return ERROR_FLASH_OPERATION_FAILED; - if( status & FLASH_PGERR ) + if (status & FLASH_PGERR) return ERROR_FLASH_OPERATION_FAILED; /* write protection byte 3 */ @@ -248,9 +201,9 @@ static int stm32x_write_options(struct flash_bank_s *bank) status = stm32x_wait_status_busy(bank, 10); - if( status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) return ERROR_FLASH_OPERATION_FAILED; - if( status & FLASH_PGERR ) + if (status & FLASH_PGERR) return ERROR_FLASH_OPERATION_FAILED; /* write protection byte 4 */ @@ -258,9 +211,9 @@ static int stm32x_write_options(struct flash_bank_s *bank) status = stm32x_wait_status_busy(bank, 10); - if( status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) return ERROR_FLASH_OPERATION_FAILED; - if( status & FLASH_PGERR ) + if (status & FLASH_PGERR) return ERROR_FLASH_OPERATION_FAILED; /* write readout protection bit */ @@ -268,9 +221,9 @@ static int stm32x_write_options(struct flash_bank_s *bank) status = stm32x_wait_status_busy(bank, 10); - if( status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) return ERROR_FLASH_OPERATION_FAILED; - if( status & FLASH_PGERR ) + if (status & FLASH_PGERR) return ERROR_FLASH_OPERATION_FAILED; target_write_u32(target, STM32_FLASH_CR, FLASH_LOCK); @@ -278,12 +231,12 @@ static int stm32x_write_options(struct flash_bank_s *bank) return ERROR_OK; } -static int stm32x_protect_check(struct flash_bank_s *bank) +static int stm32x_protect_check(struct flash_bank *bank) { - target_t *target = bank->target; - stm32x_flash_bank_t *stm32x_info = bank->driver_priv; + struct target *target = bank->target; + struct stm32x_flash_bank *stm32x_info = bank->driver_priv; - u32 protection; + uint32_t protection; int i, s; int num_bits; int set; @@ -304,14 +257,15 @@ static int stm32x_protect_check(struct flash_bank_s *bank) if (stm32x_info->ppage_size == 2) { - /* high density flash */ + /* high density flash/connectivity line protection */ set = 1; if (protection & (1 << 31)) set = 0; - /* bit 31 controls sector 62 - 255 protection */ + /* bit 31 controls sector 62 - 255 protection for high density + * bit 31 controls sector 62 - 127 protection for connectivity line */ for (s = 62; s < bank->num_sectors; s++) { bank->sectors[s].is_protected = set; @@ -333,12 +287,12 @@ static int stm32x_protect_check(struct flash_bank_s *bank) } else { - /* medium density flash */ + /* low/medium density flash protection */ for (i = 0; i < num_bits; i++) { set = 1; - if( protection & (1 << i)) + if (protection & (1 << i)) set = 0; for (s = 0; s < stm32x_info->ppage_size; s++) @@ -349,11 +303,11 @@ static int stm32x_protect_check(struct flash_bank_s *bank) return ERROR_OK; } -static int stm32x_erase(struct flash_bank_s *bank, int first, int last) +static int stm32x_erase(struct flash_bank *bank, int first, int last) { - target_t *target = bank->target; + struct target *target = bank->target; int i; - u32 status; + uint32_t status; if (bank->target->state != TARGET_HALTED) { @@ -374,13 +328,13 @@ static int stm32x_erase(struct flash_bank_s *bank, int first, int last) { target_write_u32(target, STM32_FLASH_CR, FLASH_PER); target_write_u32(target, STM32_FLASH_AR, bank->base + bank->sectors[i].offset); - target_write_u32(target, STM32_FLASH_CR, FLASH_PER|FLASH_STRT); + target_write_u32(target, STM32_FLASH_CR, FLASH_PER | FLASH_STRT); status = stm32x_wait_status_busy(bank, 10); - if( status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) return ERROR_FLASH_OPERATION_FAILED; - if( status & FLASH_PGERR ) + if (status & FLASH_PGERR) return ERROR_FLASH_OPERATION_FAILED; bank->sectors[i].is_erased = 1; } @@ -390,14 +344,14 @@ static int stm32x_erase(struct flash_bank_s *bank, int first, int last) return ERROR_OK; } -static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int last) +static int stm32x_protect(struct flash_bank *bank, int set, int first, int last) { - stm32x_flash_bank_t *stm32x_info = NULL; - target_t *target = bank->target; - u16 prot_reg[4] = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}; + struct stm32x_flash_bank *stm32x_info = NULL; + struct target *target = bank->target; + uint16_t prot_reg[4] = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}; int i, reg, bit; int status; - u32 protection; + uint32_t protection; stm32x_info = bank->driver_priv; @@ -409,7 +363,7 @@ static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int las if ((first && (first % stm32x_info->ppage_size)) || ((last + 1) && (last + 1) % stm32x_info->ppage_size)) { - LOG_WARNING("sector start/end incorrect - stm32 has %dK sector protection", stm32x_info->ppage_size); + LOG_WARNING("Error: start and end sectors must be on a %d sector boundary", stm32x_info->ppage_size); return ERROR_FLASH_SECTOR_INVALID; } @@ -417,10 +371,10 @@ static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int las * high density - each bit refers to a 2bank protection */ target_read_u32(target, STM32_FLASH_WRPR, &protection); - prot_reg[0] = (u16)protection; - prot_reg[1] = (u16)(protection >> 8); - prot_reg[2] = (u16)(protection >> 16); - prot_reg[3] = (u16)(protection >> 24); + prot_reg[0] = (uint16_t)protection; + prot_reg[1] = (uint16_t)(protection >> 8); + prot_reg[2] = (uint16_t)(protection >> 16); + prot_reg[3] = (uint16_t)(protection >> 24); if (stm32x_info->ppage_size == 2) { @@ -445,7 +399,7 @@ static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int las reg = (i / stm32x_info->ppage_size) / 8; bit = (i / stm32x_info->ppage_size) - (reg * 8); - if( set ) + if (set) prot_reg[reg] &= ~(1 << bit); else prot_reg[reg] |= (1 << bit); @@ -459,7 +413,7 @@ static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int las reg = (i / stm32x_info->ppage_size) / 8; bit = (i / stm32x_info->ppage_size) - (reg * 8); - if( set ) + if (set) prot_reg[reg] &= ~(1 << bit); else prot_reg[reg] |= (1 << bit); @@ -477,18 +431,18 @@ static int stm32x_protect(struct flash_bank_s *bank, int set, int first, int las return stm32x_write_options(bank); } -static int stm32x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int stm32x_write_block(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count) { - stm32x_flash_bank_t *stm32x_info = bank->driver_priv; - target_t *target = bank->target; - u32 buffer_size = 16384; - working_area_t *source; - u32 address = bank->base + offset; - reg_param_t reg_params[4]; - armv7m_algorithm_t armv7m_info; + struct stm32x_flash_bank *stm32x_info = bank->driver_priv; + struct target *target = bank->target; + uint32_t buffer_size = 16384; + struct working_area *source; + uint32_t address = bank->base + offset; + struct reg_param reg_params[4]; + struct armv7m_algorithm armv7m_info; int retval = ERROR_OK; - u8 stm32x_flash_write_code[] = { + uint8_t stm32x_flash_write_code[] = { /* write: */ 0xDF, 0xF8, 0x24, 0x40, /* ldr r4, STM32_FLASH_CR */ 0x09, 0x4D, /* ldr r5, STM32_FLASH_SR */ @@ -517,7 +471,7 @@ static int stm32x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; }; - if ((retval=target_write_buffer(target, stm32x_info->write_algorithm->address, sizeof(stm32x_flash_write_code), stm32x_flash_write_code))!=ERROR_OK) + if ((retval = target_write_buffer(target, stm32x_info->write_algorithm->address, sizeof(stm32x_flash_write_code), stm32x_flash_write_code)) != ERROR_OK) return retval; /* memory buffer */ @@ -545,9 +499,9 @@ static int stm32x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, 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; - if ((retval = target_write_buffer(target, source->address, thisrun_count * 2, buffer))!=ERROR_OK) + if ((retval = target_write_buffer(target, source->address, thisrun_count * 2, buffer)) != ERROR_OK) break; buf_set_u32(reg_params[0].value, 0, 32, source->address); @@ -596,14 +550,14 @@ static int stm32x_write_block(struct flash_bank_s *bank, u8 *buffer, u32 offset, return retval; } -static int stm32x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count) +static int stm32x_write(struct flash_bank *bank, 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; - u8 status; + struct target *target = bank->target; + 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; if (bank->target->state != TARGET_HALTED) @@ -614,7 +568,7 @@ static int stm32x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 c 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; } @@ -650,20 +604,20 @@ static int stm32x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 c while (words_remaining > 0) { - u16 value; - memcpy(&value, buffer + bytes_written, sizeof(u16)); + uint16_t value; + memcpy(&value, buffer + bytes_written, sizeof(uint16_t)); target_write_u32(target, STM32_FLASH_CR, FLASH_PG); target_write_u16(target, address, value); status = stm32x_wait_status_busy(bank, 5); - if( status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) { LOG_ERROR("flash memory not erased before writing"); return ERROR_FLASH_OPERATION_FAILED; } - if( status & FLASH_PGERR ) + if (status & FLASH_PGERR) { LOG_ERROR("flash memory write protected"); return ERROR_FLASH_OPERATION_FAILED; @@ -676,7 +630,7 @@ static int stm32x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 c if (bytes_remaining) { - u16 value = 0xffff; + uint16_t value = 0xffff; memcpy(&value, buffer + bytes_written, bytes_remaining); target_write_u32(target, STM32_FLASH_CR, FLASH_PG); @@ -684,12 +638,12 @@ static int stm32x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 c status = stm32x_wait_status_busy(bank, 5); - if( status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) { LOG_ERROR("flash memory not erased before writing"); return ERROR_FLASH_OPERATION_FAILED; } - if( status & FLASH_PGERR ) + if (status & FLASH_PGERR) { LOG_ERROR("flash memory write protected"); return ERROR_FLASH_OPERATION_FAILED; @@ -701,13 +655,13 @@ static int stm32x_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 c return ERROR_OK; } -static int stm32x_probe(struct flash_bank_s *bank) +static int stm32x_probe(struct flash_bank *bank) { - target_t *target = bank->target; - stm32x_flash_bank_t *stm32x_info = bank->driver_priv; + struct target *target = bank->target; + struct stm32x_flash_bank *stm32x_info = bank->driver_priv; int i; - u16 num_pages; - u32 device_id; + uint16_t num_pages; + uint32_t device_id; int page_size; if (bank->target->state != TARGET_HALTED) @@ -720,7 +674,7 @@ static int stm32x_probe(struct flash_bank_s *bank) /* read stm32 device id register */ target_read_u32(target, 0xE0042000, &device_id); - LOG_INFO( "device id = 0x%08x", device_id ); + LOG_INFO("device id = 0x%08" PRIx32 "", device_id); /* get flash size from target */ if (target_read_u16(target, 0x1FFFF7E0, &num_pages) != ERROR_OK) @@ -740,7 +694,7 @@ static int stm32x_probe(struct flash_bank_s *bank) if (num_pages == 0xffff) { /* number of sectors incorrect on revA */ - LOG_WARNING( "STM32 flash size failed, probe inaccurate - assuming 128k flash" ); + LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 128k flash"); num_pages = 128; } } @@ -755,7 +709,7 @@ static int stm32x_probe(struct flash_bank_s *bank) if (num_pages == 0xffff) { /* number of sectors incorrect on revA */ - LOG_WARNING( "STM32 flash size failed, probe inaccurate - assuming 32k flash" ); + LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 32k flash"); num_pages = 32; } } @@ -770,32 +724,32 @@ static int stm32x_probe(struct flash_bank_s *bank) if (num_pages == 0xffff) { /* number of sectors incorrect on revZ */ - LOG_WARNING( "STM32 flash size failed, probe inaccurate - assuming 512k flash" ); + LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 512k flash"); num_pages = 512; } } else if ((device_id & 0x7ff) == 0x418) { - /* connectivity line density - we have 1k pages - * 4 pages for a protection area */ - page_size = 1024; - stm32x_info->ppage_size = 4; + /* connectivity line density - we have 2k pages + * 2 pages for a protection area */ + page_size = 2048; + stm32x_info->ppage_size = 2; /* check for early silicon */ if (num_pages == 0xffff) { /* number of sectors incorrect on revZ */ - LOG_WARNING( "STM32 flash size failed, probe inaccurate - assuming 256k flash" ); + LOG_WARNING("STM32 flash size failed, probe inaccurate - assuming 256k flash"); num_pages = 256; } } else { - LOG_WARNING( "Cannot identify target as a STM32 family." ); + LOG_WARNING("Cannot identify target as a STM32 family."); return ERROR_FLASH_OPERATION_FAILED; } - LOG_INFO( "flash size = %dkbytes", num_pages ); + LOG_INFO("flash size = %dkbytes", num_pages); /* calculate numbers of pages */ num_pages /= (page_size / 1024); @@ -803,7 +757,7 @@ static int stm32x_probe(struct flash_bank_s *bank) bank->base = 0x08000000; bank->size = (num_pages * page_size); bank->num_sectors = num_pages; - bank->sectors = malloc(sizeof(flash_sector_t) * num_pages); + bank->sectors = malloc(sizeof(struct flash_sector) * num_pages); for (i = 0; i < num_pages; i++) { @@ -818,25 +772,25 @@ static int stm32x_probe(struct flash_bank_s *bank) return ERROR_OK; } -static int stm32x_auto_probe(struct flash_bank_s *bank) +static int stm32x_auto_probe(struct flash_bank *bank) { - stm32x_flash_bank_t *stm32x_info = bank->driver_priv; + struct stm32x_flash_bank *stm32x_info = bank->driver_priv; if (stm32x_info->probed) return ERROR_OK; return stm32x_probe(bank); } #if 0 -static int stm32x_handle_part_id_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(stm32x_handle_part_id_command) { return ERROR_OK; } #endif -static int stm32x_info(struct flash_bank_s *bank, char *buf, int buf_size) +static int stm32x_info(struct flash_bank *bank, char *buf, int buf_size) { - target_t *target = bank->target; - u32 device_id; + struct target *target = bank->target; + uint32_t device_id; int printed; /* read stm32 device id register */ @@ -848,7 +802,7 @@ static int stm32x_info(struct flash_bank_s *bank, char *buf, int buf_size) buf += printed; buf_size -= printed; - switch(device_id >> 16) + switch (device_id >> 16) { case 0x0000: snprintf(buf, buf_size, "A"); @@ -877,7 +831,7 @@ static int stm32x_info(struct flash_bank_s *bank, char *buf, int buf_size) buf += printed; buf_size -= printed; - switch(device_id >> 16) + switch (device_id >> 16) { case 0x1000: snprintf(buf, buf_size, "A"); @@ -894,7 +848,7 @@ static int stm32x_info(struct flash_bank_s *bank, char *buf, int buf_size) buf += printed; buf_size -= printed; - switch(device_id >> 16) + switch (device_id >> 16) { case 0x1000: snprintf(buf, buf_size, "A"); @@ -915,12 +869,16 @@ static int stm32x_info(struct flash_bank_s *bank, char *buf, int buf_size) buf += printed; buf_size -= printed; - switch(device_id >> 16) + switch (device_id >> 16) { case 0x1000: snprintf(buf, buf_size, "A"); break; + case 0x1001: + snprintf(buf, buf_size, "Z"); + break; + default: snprintf(buf, buf_size, "unknown"); break; @@ -935,24 +893,21 @@ static int stm32x_info(struct flash_bank_s *bank, char *buf, int buf_size) return ERROR_OK; } -static int stm32x_handle_lock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(stm32x_handle_lock_command) { - flash_bank_t *bank; - target_t *target = NULL; - stm32x_flash_bank_t *stm32x_info = NULL; + struct target *target = NULL; + struct stm32x_flash_bank *stm32x_info = NULL; - if (argc < 1) + if (CMD_ARGC < 1) { - command_print(cmd_ctx, "stm32x lock "); + command_print(CMD_CTX, "stm32x lock "); return ERROR_OK; } - 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; - } + struct flash_bank *bank; + int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank); + if (ERROR_OK != retval) + return retval; stm32x_info = bank->driver_priv; @@ -966,7 +921,7 @@ static int stm32x_handle_lock_command(struct command_context_s *cmd_ctx, char *c if (stm32x_erase_options(bank) != ERROR_OK) { - command_print(cmd_ctx, "stm32x failed to erase options"); + command_print(CMD_CTX, "stm32x failed to erase options"); return ERROR_OK; } @@ -975,33 +930,30 @@ static int stm32x_handle_lock_command(struct command_context_s *cmd_ctx, char *c if (stm32x_write_options(bank) != ERROR_OK) { - command_print(cmd_ctx, "stm32x failed to lock device"); + command_print(CMD_CTX, "stm32x failed to lock device"); return ERROR_OK; } - command_print(cmd_ctx, "stm32x locked"); + command_print(CMD_CTX, "stm32x locked"); return ERROR_OK; } -static int stm32x_handle_unlock_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(stm32x_handle_unlock_command) { - flash_bank_t *bank; - target_t *target = NULL; - stm32x_flash_bank_t *stm32x_info = NULL; + struct target *target = NULL; + struct stm32x_flash_bank *stm32x_info = NULL; - if (argc < 1) + if (CMD_ARGC < 1) { - command_print(cmd_ctx, "stm32x unlock "); + command_print(CMD_CTX, "stm32x unlock "); return ERROR_OK; } - 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; - } + struct flash_bank *bank; + int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank); + if (ERROR_OK != retval) + return retval; stm32x_info = bank->driver_priv; @@ -1015,40 +967,37 @@ static int stm32x_handle_unlock_command(struct command_context_s *cmd_ctx, char if (stm32x_erase_options(bank) != ERROR_OK) { - command_print(cmd_ctx, "stm32x failed to unlock device"); + command_print(CMD_CTX, "stm32x failed to unlock device"); return ERROR_OK; } if (stm32x_write_options(bank) != ERROR_OK) { - command_print(cmd_ctx, "stm32x failed to lock device"); + command_print(CMD_CTX, "stm32x failed to lock device"); return ERROR_OK; } - command_print(cmd_ctx, "stm32x unlocked"); + command_print(CMD_CTX, "stm32x unlocked"); return ERROR_OK; } -static int stm32x_handle_options_read_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(stm32x_handle_options_read_command) { - flash_bank_t *bank; - u32 optionbyte; - target_t *target = NULL; - stm32x_flash_bank_t *stm32x_info = NULL; + uint32_t optionbyte; + struct target *target = NULL; + struct stm32x_flash_bank *stm32x_info = NULL; - if (argc < 1) + if (CMD_ARGC < 1) { - command_print(cmd_ctx, "stm32x options_read "); + command_print(CMD_CTX, "stm32x options_read "); return ERROR_OK; } - 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; - } + struct flash_bank *bank; + int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank); + if (ERROR_OK != retval) + return retval; stm32x_info = bank->driver_priv; @@ -1061,53 +1010,50 @@ static int stm32x_handle_options_read_command(struct command_context_s *cmd_ctx, } target_read_u32(target, STM32_FLASH_OBR, &optionbyte); - command_print(cmd_ctx, "Option Byte: 0x%x", optionbyte); + command_print(CMD_CTX, "Option Byte: 0x%" PRIx32 "", optionbyte); - if (buf_get_u32((u8*)&optionbyte, OPT_ERROR, 1)) - command_print(cmd_ctx, "Option Byte Complement Error"); + if (buf_get_u32((uint8_t*)&optionbyte, OPT_ERROR, 1)) + command_print(CMD_CTX, "Option Byte Complement Error"); - if (buf_get_u32((u8*)&optionbyte, OPT_READOUT, 1)) - command_print(cmd_ctx, "Readout Protection On"); + if (buf_get_u32((uint8_t*)&optionbyte, OPT_READOUT, 1)) + command_print(CMD_CTX, "Readout Protection On"); else - command_print(cmd_ctx, "Readout Protection Off"); + command_print(CMD_CTX, "Readout Protection Off"); - if (buf_get_u32((u8*)&optionbyte, OPT_RDWDGSW, 1)) - command_print(cmd_ctx, "Software Watchdog"); + if (buf_get_u32((uint8_t*)&optionbyte, OPT_RDWDGSW, 1)) + command_print(CMD_CTX, "Software Watchdog"); else - command_print(cmd_ctx, "Hardware Watchdog"); + command_print(CMD_CTX, "Hardware Watchdog"); - if (buf_get_u32((u8*)&optionbyte, OPT_RDRSTSTOP, 1)) - command_print(cmd_ctx, "Stop: No reset generated"); + if (buf_get_u32((uint8_t*)&optionbyte, OPT_RDRSTSTOP, 1)) + command_print(CMD_CTX, "Stop: No reset generated"); else - command_print(cmd_ctx, "Stop: Reset generated"); + command_print(CMD_CTX, "Stop: Reset generated"); - if (buf_get_u32((u8*)&optionbyte, OPT_RDRSTSTDBY, 1)) - command_print(cmd_ctx, "Standby: No reset generated"); + if (buf_get_u32((uint8_t*)&optionbyte, OPT_RDRSTSTDBY, 1)) + command_print(CMD_CTX, "Standby: No reset generated"); else - command_print(cmd_ctx, "Standby: Reset generated"); + command_print(CMD_CTX, "Standby: Reset generated"); return ERROR_OK; } -static int stm32x_handle_options_write_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(stm32x_handle_options_write_command) { - flash_bank_t *bank; - target_t *target = NULL; - stm32x_flash_bank_t *stm32x_info = NULL; - u16 optionbyte = 0xF8; + struct target *target = NULL; + struct stm32x_flash_bank *stm32x_info = NULL; + uint16_t optionbyte = 0xF8; - if (argc < 4) + if (CMD_ARGC < 4) { - command_print(cmd_ctx, "stm32x options_write "); + command_print(CMD_CTX, "stm32x options_write "); return ERROR_OK; } - 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; - } + struct flash_bank *bank; + int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank); + if (ERROR_OK != retval) + return retval; stm32x_info = bank->driver_priv; @@ -1119,36 +1065,36 @@ static int stm32x_handle_options_write_command(struct command_context_s *cmd_ctx return ERROR_TARGET_NOT_HALTED; } - if (strcmp(args[1], "SWWDG") == 0) + if (strcmp(CMD_ARGV[1], "SWWDG") == 0) { - optionbyte |= (1<<0); + optionbyte |= (1 << 0); } else { - optionbyte &= ~(1<<0); + optionbyte &= ~(1 << 0); } - if (strcmp(args[2], "NORSTSTNDBY") == 0) + if (strcmp(CMD_ARGV[2], "NORSTSTNDBY") == 0) { - optionbyte |= (1<<1); + optionbyte |= (1 << 1); } else { - optionbyte &= ~(1<<1); + optionbyte &= ~(1 << 1); } - if (strcmp(args[3], "NORSTSTOP") == 0) + if (strcmp(CMD_ARGV[3], "NORSTSTOP") == 0) { - optionbyte |= (1<<2); + optionbyte |= (1 << 2); } else { - optionbyte &= ~(1<<2); + optionbyte &= ~(1 << 2); } if (stm32x_erase_options(bank) != ERROR_OK) { - command_print(cmd_ctx, "stm32x failed to erase options"); + command_print(CMD_CTX, "stm32x failed to erase options"); return ERROR_OK; } @@ -1156,19 +1102,19 @@ static int stm32x_handle_options_write_command(struct command_context_s *cmd_ctx if (stm32x_write_options(bank) != ERROR_OK) { - command_print(cmd_ctx, "stm32x failed to write options"); + command_print(CMD_CTX, "stm32x failed to write options"); return ERROR_OK; } - command_print(cmd_ctx, "stm32x write options complete"); + command_print(CMD_CTX, "stm32x write options complete"); return ERROR_OK; } -static int stm32x_mass_erase(struct flash_bank_s *bank) +static int stm32x_mass_erase(struct flash_bank *bank) { - target_t *target = bank->target; - u32 status; + struct target *target = bank->target; + uint32_t status; if (target->state != TARGET_HALTED) { @@ -1182,19 +1128,19 @@ static int stm32x_mass_erase(struct flash_bank_s *bank) /* mass erase flash memory */ target_write_u32(target, STM32_FLASH_CR, FLASH_MER); - target_write_u32(target, STM32_FLASH_CR, FLASH_MER|FLASH_STRT); + target_write_u32(target, STM32_FLASH_CR, FLASH_MER | FLASH_STRT); status = stm32x_wait_status_busy(bank, 10); target_write_u32(target, STM32_FLASH_CR, FLASH_LOCK); - if( status & FLASH_WRPRTERR ) + if (status & FLASH_WRPRTERR) { LOG_ERROR("stm32x device protected"); return ERROR_OK; } - if( status & FLASH_PGERR ) + if (status & FLASH_PGERR) { LOG_ERROR("stm32x device programming failed"); return ERROR_OK; @@ -1203,23 +1149,20 @@ static int stm32x_mass_erase(struct flash_bank_s *bank) return ERROR_OK; } -static int stm32x_handle_mass_erase_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(stm32x_handle_mass_erase_command) { - flash_bank_t *bank; int i; - if (argc < 1) + if (CMD_ARGC < 1) { - command_print(cmd_ctx, "stm32x mass_erase "); + command_print(CMD_CTX, "stm32x mass_erase "); return ERROR_OK; } - 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; - } + struct flash_bank *bank; + int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank); + if (ERROR_OK != retval) + return retval; if (stm32x_mass_erase(bank) == ERROR_OK) { @@ -1229,12 +1172,50 @@ static int stm32x_handle_mass_erase_command(struct command_context_s *cmd_ctx, c bank->sectors[i].is_erased = 1; } - command_print(cmd_ctx, "stm32x mass erase complete"); + command_print(CMD_CTX, "stm32x mass erase complete"); } else { - command_print(cmd_ctx, "stm32x mass erase failed"); + command_print(CMD_CTX, "stm32x mass erase failed"); } return ERROR_OK; } + +static int stm32x_register_commands(struct command_context *cmd_ctx) +{ + struct command *stm32x_cmd = COMMAND_REGISTER(cmd_ctx, NULL, "stm32x", + NULL, COMMAND_ANY, "stm32x flash specific commands"); + + COMMAND_REGISTER(cmd_ctx, stm32x_cmd, "lock", + stm32x_handle_lock_command, COMMAND_EXEC, + "lock device"); + COMMAND_REGISTER(cmd_ctx, stm32x_cmd, "unlock", + stm32x_handle_unlock_command, COMMAND_EXEC, + "unlock protected device"); + COMMAND_REGISTER(cmd_ctx, stm32x_cmd, "mass_erase", + stm32x_handle_mass_erase_command, COMMAND_EXEC, + "mass erase device"); + COMMAND_REGISTER(cmd_ctx, stm32x_cmd, "options_read", + stm32x_handle_options_read_command, COMMAND_EXEC, + "read device option bytes"); + COMMAND_REGISTER(cmd_ctx, stm32x_cmd, "options_write", + stm32x_handle_options_write_command, COMMAND_EXEC, + "write device option bytes"); + + return ERROR_OK; +} + +struct flash_driver stm32x_flash = { + .name = "stm32x", + .register_commands = &stm32x_register_commands, + .flash_bank_command = &stm32x_flash_bank_command, + .erase = &stm32x_erase, + .protect = &stm32x_protect, + .write = &stm32x_write, + .probe = &stm32x_probe, + .auto_probe = &stm32x_auto_probe, + .erase_check = &default_flash_mem_blank_check, + .protect_check = &stm32x_protect_check, + .info = &stm32x_info, + };