X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fstm32f1x.c;h=af7d9ea3970034cf04d446d12625cbb5bfb0231e;hp=13affcda71589ba43dbb0b68ab2aba05c14b56ea;hb=bee7836b6a155b89f454b64f626a497c767f13f6;hpb=bd5df8520b5d1755c8c8a86a0f64d3aa452729ca diff --git a/src/flash/nor/stm32f1x.c b/src/flash/nor/stm32f1x.c index 13affcda71..af7d9ea397 100644 --- a/src/flash/nor/stm32f1x.c +++ b/src/flash/nor/stm32f1x.c @@ -21,7 +21,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 @@ -124,6 +124,8 @@ struct stm32x_flash_bank { uint32_t register_base; uint16_t default_rdp; int user_data_offset; + int option_offset; + uint32_t user_bank_size; }; static int stm32x_mass_erase(struct flash_bank *bank); @@ -146,6 +148,10 @@ FLASH_BANK_COMMAND_HANDLER(stm32x_flash_bank_command) stm32x_info->probed = 0; stm32x_info->has_dual_banks = false; stm32x_info->register_base = FLASH_REG_BASE_B0; + stm32x_info->user_bank_size = bank->size; + + /* the stm32l erased value is 0x00 */ + bank->default_padded_value = 0x00; return ERROR_OK; } @@ -204,7 +210,7 @@ static int stm32x_wait_status_busy(struct flash_bank *bank, int timeout) return retval; } -int stm32x_check_operation_supported(struct flash_bank *bank) +static int stm32x_check_operation_supported(struct flash_bank *bank) { struct stm32x_flash_bank *stm32x_info = bank->driver_priv; @@ -231,7 +237,7 @@ static int stm32x_read_options(struct flash_bank *bank) if (retval != ERROR_OK) return retval; - stm32x_info->option_bytes.user_options = (uint16_t)0xFFF0 | ((optiondata >> 2) & 0x0f); + stm32x_info->option_bytes.user_options = (optiondata >> stm32x_info->option_offset >> 2) & 0xffff; stm32x_info->option_bytes.user_data = (optiondata >> stm32x_info->user_data_offset) & 0xffff; stm32x_info->option_bytes.RDP = (optiondata & (1 << OPT_READOUT)) ? 0xFFFF : 0x5AA5; @@ -361,11 +367,6 @@ static int stm32x_protect_check(struct flash_bank *bank) int num_bits; int set; - if (target->state != TARGET_HALTED) { - LOG_ERROR("Target not halted"); - return ERROR_TARGET_NOT_HALTED; - } - int retval = stm32x_check_operation_supported(bank); if (ERROR_OK != retval) return retval; @@ -625,7 +626,7 @@ static int stm32x_write_block(struct flash_bank *bank, uint8_t *buffer, }; retval = target_write_buffer(target, write_algorithm->address, - sizeof(stm32x_flash_write_code), (uint8_t *)stm32x_flash_write_code); + sizeof(stm32x_flash_write_code), stm32x_flash_write_code); if (retval != ERROR_OK) return retval; @@ -857,6 +858,7 @@ static int stm32x_probe(struct flash_bank *bank) stm32x_info->probed = 0; stm32x_info->register_base = FLASH_REG_BASE_B0; stm32x_info->user_data_offset = 10; + stm32x_info->option_offset = 0; /* default factory protection level */ stm32x_info->default_rdp = 0x5AA5; @@ -900,6 +902,7 @@ static int stm32x_probe(struct flash_bank *bank) stm32x_info->ppage_size = 2; max_flash_size_in_kb = 256; stm32x_info->user_data_offset = 16; + stm32x_info->option_offset = 6; stm32x_info->default_rdp = 0x55AA; break; case 0x428: /* value line High density */ @@ -918,13 +921,16 @@ static int stm32x_probe(struct flash_bank *bank) stm32x_info->ppage_size = 2; max_flash_size_in_kb = 256; stm32x_info->user_data_offset = 16; + stm32x_info->option_offset = 6; stm32x_info->default_rdp = 0x55AA; break; case 0x440: /* stm32f0x */ + case 0x444: page_size = 1024; stm32x_info->ppage_size = 4; max_flash_size_in_kb = 64; stm32x_info->user_data_offset = 16; + stm32x_info->option_offset = 6; stm32x_info->default_rdp = 0x55AA; break; default: @@ -958,9 +964,9 @@ static int stm32x_probe(struct flash_bank *bank) /* if the user sets the size manually then ignore the probed value * this allows us to work around devices that have a invalid flash size register value */ - if (bank->size) { + if (stm32x_info->user_bank_size) { LOG_INFO("ignoring flash probed value, using configured bank size"); - flash_size_in_kb = bank->size / 1024; + flash_size_in_kb = stm32x_info->user_bank_size / 1024; } LOG_INFO("flash size = %dkbytes", flash_size_in_kb); @@ -1013,203 +1019,182 @@ COMMAND_HANDLER(stm32x_handle_part_id_command) static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size) { - uint32_t device_id; - int printed; + uint32_t dbgmcu_idcode; /* read stm32 device id register */ - int retval = stm32x_get_device_id(bank, &device_id); + int retval = stm32x_get_device_id(bank, &dbgmcu_idcode); if (retval != ERROR_OK) return retval; - if ((device_id & 0xfff) == 0x410) { - printed = snprintf(buf, buf_size, "stm32x (Medium Density) - Rev: "); - buf += printed; - buf_size -= printed; + uint16_t device_id = dbgmcu_idcode & 0xfff; + uint16_t rev_id = dbgmcu_idcode >> 16; + const char *device_str; + const char *rev_str = NULL; - switch (device_id >> 16) { - case 0x0000: - snprintf(buf, buf_size, "A"); - break; + switch (device_id) { + case 0x410: + device_str = "STM32F10x (Medium Density)"; - case 0x2000: - snprintf(buf, buf_size, "B"); - break; + switch (rev_id) { + case 0x0000: + rev_str = "A"; + break; - case 0x2001: - snprintf(buf, buf_size, "Z"); - break; + case 0x2000: + rev_str = "B"; + break; - case 0x2003: - snprintf(buf, buf_size, "Y"); - break; + case 0x2001: + rev_str = "Z"; + break; - default: - snprintf(buf, buf_size, "unknown"); - break; + case 0x2003: + rev_str = "Y"; + break; } - } else if ((device_id & 0xfff) == 0x412) { - printed = snprintf(buf, buf_size, "stm32x (Low Density) - Rev: "); - buf += printed; - buf_size -= printed; - - switch (device_id >> 16) { - case 0x1000: - snprintf(buf, buf_size, "A"); - break; - - default: - snprintf(buf, buf_size, "unknown"); - break; + break; + + case 0x412: + device_str = "STM32F10x (Low Density)"; + + switch (rev_id) { + case 0x1000: + rev_str = "A"; + break; } - } else if ((device_id & 0xfff) == 0x414) { - printed = snprintf(buf, buf_size, "stm32x (High Density) - Rev: "); - buf += printed; - buf_size -= printed; - - 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; + break; + + case 0x414: + device_str = "STM32F10x (High Density)"; + + switch (rev_id) { + case 0x1000: + rev_str = "A"; + break; + + case 0x1001: + rev_str = "Z"; + break; + + case 0x1003: + rev_str = "Y"; + break; } - } else if ((device_id & 0xfff) == 0x418) { - printed = snprintf(buf, buf_size, "stm32x (Connectivity) - Rev: "); - buf += printed; - buf_size -= printed; - - 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; + break; + + case 0x418: + device_str = "STM32F10x (Connectivity)"; + + switch (rev_id) { + case 0x1000: + rev_str = "A"; + break; + + case 0x1001: + rev_str = "Z"; + break; } - } else if ((device_id & 0xfff) == 0x420) { - printed = snprintf(buf, buf_size, "stm32x (Value) - Rev: "); - buf += printed; - buf_size -= printed; - - 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; + break; + + case 0x420: + device_str = "STM32F100 (Low/Medium Density)"; + + switch (rev_id) { + case 0x1000: + rev_str = "A"; + break; + + case 0x1001: + rev_str = "Z"; + break; } - } else if ((device_id & 0xfff) == 0x422) { - printed = snprintf(buf, buf_size, "stm32f30x - Rev: "); - buf += printed; - buf_size -= printed; - - switch (device_id >> 16) { - case 0x1000: - snprintf(buf, buf_size, "A"); - break; - - case 0x1001: - snprintf(buf, buf_size, "Z"); - break; - - case 0x2000: - snprintf(buf, buf_size, "B"); - break; - - default: - snprintf(buf, buf_size, "unknown"); - break; + break; + + case 0x422: + device_str = "STM32F30x"; + + switch (rev_id) { + case 0x1000: + rev_str = "A"; + break; + + case 0x1001: + rev_str = "Z"; + break; + + case 0x1003: + rev_str = "Y"; + break; + + case 0x2000: + rev_str = "B"; + break; } - } else if ((device_id & 0xfff) == 0x428) { - printed = snprintf(buf, buf_size, "stm32x (Value HD) - Rev: "); - buf += printed; - buf_size -= printed; - - 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; + break; + + case 0x428: + device_str = "STM32F100 (High Density)"; + + switch (rev_id) { + case 0x1000: + rev_str = "A"; + break; + + case 0x1001: + rev_str = "Z"; + break; } - } else if ((device_id & 0xfff) == 0x430) { - printed = snprintf(buf, buf_size, "stm32x (XL) - Rev: "); - buf += printed; - buf_size -= printed; - - switch (device_id >> 16) { - case 0x1000: - snprintf(buf, buf_size, "A"); - break; - - default: - snprintf(buf, buf_size, "unknown"); - break; + break; + + case 0x430: + device_str = "STM32F10x (XL Density)"; + + switch (rev_id) { + case 0x1000: + rev_str = "A"; + break; } - } else if ((device_id & 0xfff) == 0x432) { - printed = snprintf(buf, buf_size, "stm32f37x - Rev: "); - buf += printed; - buf_size -= printed; - - switch (device_id >> 16) { - case 0x1000: - snprintf(buf, buf_size, "A"); - break; - - case 0x2000: - snprintf(buf, buf_size, "B"); - break; - - default: - snprintf(buf, buf_size, "unknown"); - break; + break; + + case 0x432: + device_str = "STM32F37x"; + + switch (rev_id) { + case 0x1000: + rev_str = "A"; + break; + + case 0x2000: + rev_str = "B"; + break; } - } else if ((device_id & 0xfff) == 0x440) { - printed = snprintf(buf, buf_size, "stm32f0x - Rev: "); - buf += printed; - buf_size -= printed; - - switch (device_id >> 16) { - case 0x1000: - snprintf(buf, buf_size, "1.0"); - break; - - case 0x2000: - snprintf(buf, buf_size, "2.0"); - break; - - default: - snprintf(buf, buf_size, "unknown"); - break; + break; + + case 0x440: + case 0x444: + device_str = "STM32F0xx"; + + switch (rev_id) { + case 0x1000: + rev_str = "1.0"; + break; + + case 0x2000: + rev_str = "2.0"; + break; } - } else { - snprintf(buf, buf_size, "Cannot identify target as a stm32x\n"); + break; + + default: + snprintf(buf, buf_size, "Cannot identify target as a STM32F0/1/3\n"); return ERROR_FAIL; } + if (rev_str != NULL) + snprintf(buf, buf_size, "%s - Rev: %s", device_str, rev_str); + else + snprintf(buf, buf_size, "%s - Rev: unknown (0x%04x)", device_str, rev_id); + return ERROR_OK; } @@ -1329,40 +1314,45 @@ COMMAND_HANDLER(stm32x_handle_options_read_command) return retval; command_print(CMD_CTX, "Option Byte: 0x%" PRIx32 "", optionbyte); - if (buf_get_u32((uint8_t *)&optionbyte, OPT_ERROR, 1)) + int user_data = optionbyte; + + if (optionbyte >> OPT_ERROR & 1) command_print(CMD_CTX, "Option Byte Complement Error"); - if (buf_get_u32((uint8_t *)&optionbyte, OPT_READOUT, 1)) + if (optionbyte >> OPT_READOUT & 1) command_print(CMD_CTX, "Readout Protection On"); else command_print(CMD_CTX, "Readout Protection Off"); - if (buf_get_u32((uint8_t *)&optionbyte, OPT_RDWDGSW, 1)) + /* user option bytes are offset depending on variant */ + optionbyte >>= stm32x_info->option_offset; + + if (optionbyte >> OPT_RDWDGSW & 1) command_print(CMD_CTX, "Software Watchdog"); else command_print(CMD_CTX, "Hardware Watchdog"); - if (buf_get_u32((uint8_t *)&optionbyte, OPT_RDRSTSTOP, 1)) + if (optionbyte >> OPT_RDRSTSTOP & 1) command_print(CMD_CTX, "Stop: No reset generated"); else command_print(CMD_CTX, "Stop: Reset generated"); - if (buf_get_u32((uint8_t *)&optionbyte, OPT_RDRSTSTDBY, 1)) + if (optionbyte >> OPT_RDRSTSTDBY & 1) command_print(CMD_CTX, "Standby: No reset generated"); else command_print(CMD_CTX, "Standby: Reset generated"); if (stm32x_info->has_dual_banks) { - if (buf_get_u32((uint8_t *)&optionbyte, OPT_BFB2, 1)) + if (optionbyte >> OPT_BFB2 & 1) command_print(CMD_CTX, "Boot: Bank 0"); else command_print(CMD_CTX, "Boot: Bank 1"); } command_print(CMD_CTX, "User Option0: 0x%02" PRIx8, - (optionbyte >> stm32x_info->user_data_offset) & 0xff); + (user_data >> stm32x_info->user_data_offset) & 0xff); command_print(CMD_CTX, "User Option1: 0x%02" PRIx8, - (optionbyte >> (stm32x_info->user_data_offset + 8)) & 0xff); + (user_data >> (stm32x_info->user_data_offset + 8)) & 0xff); return ERROR_OK; }