X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fefm32.c;h=0b33829bae2534d309ae90489abb8f3bce206377;hp=2c20addca23ad6ee64934c9933fb8e41d7239a07;hb=b9ee6dd4655310c0553f4eef853213b11c1df28f;hpb=ba2fbe22470915359e1905aaad4c613eacbdf6dc diff --git a/src/flash/nor/efm32.c b/src/flash/nor/efm32.c index 2c20addca2..0b33829bae 100644 --- a/src/flash/nor/efm32.c +++ b/src/flash/nor/efm32.c @@ -10,7 +10,10 @@ * * * Copyright (C) 2013 by Roman Dmitrienko * * me@iamroman.org * - * + * * + * Copyright (C) 2014 Nemui Trinomius * + * nemuisan_kawausogasuki@live.jp * + * * * 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 * @@ -22,9 +25,7 @@ * GNU General Public License for more details. * * * * 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., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * + * along with this program. If not, see . * ***************************************************************************/ #ifdef HAVE_CONFIG_H @@ -42,6 +43,11 @@ #define EFM_FAMILY_ID_GIANT_GECKO 72 #define EFM_FAMILY_ID_TINY_GECKO 73 #define EFM_FAMILY_ID_LEOPARD_GECKO 74 +#define EFM_FAMILY_ID_WONDER_GECKO 75 +#define EFM_FAMILY_ID_ZERO_GECKO 76 +#define EFM_FAMILY_ID_HAPPY_GECKO 77 +#define EZR_FAMILY_ID_WONDER_GECKO 120 +#define EZR_FAMILY_ID_LEOPARD_GECKO 121 #define EFM32_FLASH_ERASE_TMO 100 #define EFM32_FLASH_WDATAREADY_TMO 100 @@ -56,7 +62,7 @@ #define EFM32_MSC_LOCK_BITS (EFM32_MSC_INFO_BASE+0x4000) #define EFM32_MSC_DEV_INFO (EFM32_MSC_INFO_BASE+0x8000) -/* PAGE_SIZE is only present in Leopard and Giant Gecko MCUs */ +/* PAGE_SIZE is only present in Leopard, Giant and Wonder Gecko MCUs */ #define EFM32_MSC_DI_PAGE_SIZE (EFM32_MSC_DEV_INFO+0x1e7) #define EFM32_MSC_DI_FLASH_SZ (EFM32_MSC_DEV_INFO+0x1f8) #define EFM32_MSC_DI_RAM_SZ (EFM32_MSC_DEV_INFO+0x1fa) @@ -97,7 +103,7 @@ struct efm32_info { uint16_t page_size; }; -static int efm32x_write(struct flash_bank *bank, uint8_t *buffer, +static int efm32x_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t offset, uint32_t count); static int efm32x_get_flash_size(struct flash_bank *bank, uint16_t *flash_sz) @@ -138,9 +144,13 @@ static int efm32x_read_info(struct flash_bank *bank, return ret; if (((cpuid >> 4) & 0xfff) == 0xc23) { - /* Cortex M3 device */ + /* Cortex-M3 device */ + } else if (((cpuid >> 4) & 0xfff) == 0xc24) { + /* Cortex-M4 device (WONDER GECKO) */ + } else if (((cpuid >> 4) & 0xfff) == 0xc60) { + /* Cortex-M0+ device */ } else { - LOG_ERROR("Target is not CortexM3"); + LOG_ERROR("Target is not Cortex-Mx Device"); return ERROR_FAIL; } @@ -167,6 +177,9 @@ static int efm32x_read_info(struct flash_bank *bank, if (EFM_FAMILY_ID_GECKO == efm32_info->part_family || EFM_FAMILY_ID_TINY_GECKO == efm32_info->part_family) efm32_info->page_size = 512; + else if (EFM_FAMILY_ID_ZERO_GECKO == efm32_info->part_family || + EFM_FAMILY_ID_HAPPY_GECKO == efm32_info->part_family) + efm32_info->page_size = 1024; else if (EFM_FAMILY_ID_GIANT_GECKO == efm32_info->part_family || EFM_FAMILY_ID_LEOPARD_GECKO == efm32_info->part_family) { if (efm32_info->prod_rev >= 18) { @@ -191,6 +204,20 @@ static int efm32x_read_info(struct flash_bank *bank, LOG_ERROR("Invalid page size %u", efm32_info->page_size); return ERROR_FAIL; } + } else if (EFM_FAMILY_ID_WONDER_GECKO == efm32_info->part_family || + EZR_FAMILY_ID_WONDER_GECKO == efm32_info->part_family || + EZR_FAMILY_ID_LEOPARD_GECKO == efm32_info->part_family) { + uint8_t pg_size = 0; + ret = target_read_u8(bank->target, EFM32_MSC_DI_PAGE_SIZE, + &pg_size); + if (ERROR_OK != ret) + return ret; + + efm32_info->page_size = (1 << ((pg_size+10) & 0xff)); + if (2048 != efm32_info->page_size) { + LOG_ERROR("Invalid page size %u", efm32_info->page_size); + return ERROR_FAIL; + } } else { LOG_ERROR("Unknown MCU family %d", efm32_info->part_family); return ERROR_FAIL; @@ -199,6 +226,70 @@ static int efm32x_read_info(struct flash_bank *bank, return ERROR_OK; } +/* + * Helper to create a human friendly string describing a part + */ +static int efm32x_decode_info(struct efm32_info *info, char *buf, int buf_size) +{ + int printed = 0; + + switch (info->part_family) { + case EZR_FAMILY_ID_WONDER_GECKO: + case EZR_FAMILY_ID_LEOPARD_GECKO: + printed = snprintf(buf, buf_size, "EZR32 "); + break; + default: + printed = snprintf(buf, buf_size, "EFM32 "); + } + + buf += printed; + buf_size -= printed; + + if (0 >= buf_size) + return ERROR_BUF_TOO_SMALL; + + switch (info->part_family) { + case EFM_FAMILY_ID_GECKO: + printed = snprintf(buf, buf_size, "Gecko"); + break; + case EFM_FAMILY_ID_GIANT_GECKO: + printed = snprintf(buf, buf_size, "Giant Gecko"); + break; + case EFM_FAMILY_ID_TINY_GECKO: + printed = snprintf(buf, buf_size, "Tiny Gecko"); + break; + case EFM_FAMILY_ID_LEOPARD_GECKO: + case EZR_FAMILY_ID_LEOPARD_GECKO: + printed = snprintf(buf, buf_size, "Leopard Gecko"); + break; + case EFM_FAMILY_ID_WONDER_GECKO: + case EZR_FAMILY_ID_WONDER_GECKO: + printed = snprintf(buf, buf_size, "Wonder Gecko"); + break; + case EFM_FAMILY_ID_ZERO_GECKO: + printed = snprintf(buf, buf_size, "Zero Gecko"); + break; + case EFM_FAMILY_ID_HAPPY_GECKO: + printed = snprintf(buf, buf_size, "Happy Gecko"); + break; + } + + buf += printed; + buf_size -= printed; + + if (0 >= buf_size) + return ERROR_BUF_TOO_SMALL; + + printed = snprintf(buf, buf_size, " - Rev: %d", info->prod_rev); + buf += printed; + buf_size -= printed; + + if (0 >= buf_size) + return ERROR_BUF_TOO_SMALL; + + return ERROR_OK; +} + /* flash bank efm32 0 0 */ FLASH_BANK_COMMAND_HANDLER(efm32x_flash_bank_command) @@ -484,7 +575,7 @@ static int efm32x_protect(struct flash_bank *bank, int set, int first, int last) return ERROR_OK; } -static int efm32x_write_block(struct flash_bank *bank, uint8_t *buf, +static int efm32x_write_block(struct flash_bank *bank, const uint8_t *buf, uint32_t offset, uint32_t count) { struct target *target = bank->target; @@ -575,7 +666,7 @@ static int efm32x_write_block(struct flash_bank *bank, uint8_t *buf, &write_algorithm) != ERROR_OK) { LOG_WARNING("no working area available, can't do block memory writes"); return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; - }; + } ret = target_write_buffer(target, write_algorithm->address, sizeof(efm32x_flash_write_code), efm32x_flash_write_code); @@ -594,7 +685,7 @@ static int efm32x_write_block(struct flash_bank *bank, uint8_t *buf, LOG_WARNING("no large enough working area available, can't do block memory writes"); return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; } - }; + } init_reg_param(®_params[0], "r0", 32, PARAM_IN_OUT); /* flash base (in), status (out) */ init_reg_param(®_params[1], "r1", 32, PARAM_OUT); /* count (word-32bit) */ @@ -720,7 +811,7 @@ static int efm32x_write_word(struct flash_bank *bank, uint32_t addr, return ERROR_OK; } -static int efm32x_write(struct flash_bank *bank, uint8_t *buffer, +static int efm32x_write(struct flash_bank *bank, const uint8_t *buffer, uint32_t offset, uint32_t count) { struct target *target = bank->target; @@ -748,7 +839,7 @@ static int efm32x_write(struct flash_bank *bank, uint8_t *buffer, } LOG_INFO("odd number of bytes to write (%" PRIu32 "), extending to %" PRIu32 " " "and padding with 0xff", old_count, count); - memset(buffer, 0xff, count); + memset(new_buffer, 0xff, count); buffer = memcpy(new_buffer, buffer, old_count); } @@ -804,6 +895,7 @@ static int efm32x_probe(struct flash_bank *bank) int ret; int i; uint32_t base_address = 0x00000000; + char buf[256]; efm32x_info->probed = 0; memset(efm32x_info->lb_page, 0xff, LOCKBITS_PAGE_SZ); @@ -812,25 +904,11 @@ static int efm32x_probe(struct flash_bank *bank) if (ERROR_OK != ret) return ret; - switch (efm32_mcu_info.part_family) { - case EFM_FAMILY_ID_GECKO: - LOG_INFO("Gecko MCU detected"); - break; - case EFM_FAMILY_ID_GIANT_GECKO: - LOG_INFO("Giant Gecko MCU detected"); - break; - case EFM_FAMILY_ID_TINY_GECKO: - LOG_INFO("Tiny Gecko MCU detected"); - break; - case EFM_FAMILY_ID_LEOPARD_GECKO: - LOG_INFO("Leopard Gecko MCU detected"); - break; - default: - LOG_ERROR("Unsupported MCU family %d", - efm32_mcu_info.part_family); - return ERROR_FAIL; - } + ret = efm32x_decode_info(&efm32_mcu_info, buf, sizeof(buf)); + if (ERROR_OK != ret) + return ret; + LOG_INFO("detected part: %s", buf); LOG_INFO("flash size = %dkbytes", efm32_mcu_info.flash_sz_kib); LOG_INFO("flash page size = %dbytes", efm32_mcu_info.page_size); @@ -907,7 +985,6 @@ static int get_efm32x_info(struct flash_bank *bank, char *buf, int buf_size) { struct efm32_info info; int ret = 0; - int printed = 0; ret = efm32x_read_info(bank, &info); if (ERROR_OK != ret) { @@ -915,45 +992,53 @@ static int get_efm32x_info(struct flash_bank *bank, char *buf, int buf_size) return ret; } - printed = snprintf(buf, buf_size, "EFM32 "); - buf += printed; - buf_size -= printed; + return efm32x_decode_info(&info, buf, buf_size); +} - if (0 >= buf_size) - return ERROR_BUF_TOO_SMALL; +COMMAND_HANDLER(efm32x_handle_debuglock_command) +{ + struct target *target = NULL; - switch (info.part_family) { - case EFM_FAMILY_ID_GECKO: - printed = snprintf(buf, buf_size, "Gecko"); - break; - case EFM_FAMILY_ID_GIANT_GECKO: - printed = snprintf(buf, buf_size, "Giant Gecko"); - break; - case EFM_FAMILY_ID_TINY_GECKO: - printed = snprintf(buf, buf_size, "Tiny Gecko"); - break; - case EFM_FAMILY_ID_LEOPARD_GECKO: - printed = snprintf(buf, buf_size, "Leopard Gecko"); - break; - } + if (CMD_ARGC < 1) + return ERROR_COMMAND_SYNTAX_ERROR; - buf += printed; - buf_size -= printed; + struct flash_bank *bank; + int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank); + if (ERROR_OK != retval) + return retval; - if (0 >= buf_size) - return ERROR_BUF_TOO_SMALL; + struct efm32x_flash_bank *efm32x_info = bank->driver_priv; - printed = snprintf(buf, buf_size, " - Rev: %d", info.prod_rev); - buf += printed; - buf_size -= printed; + target = bank->target; - if (0 >= buf_size) - return ERROR_BUF_TOO_SMALL; + if (target->state != TARGET_HALTED) { + LOG_ERROR("Target not halted"); + return ERROR_TARGET_NOT_HALTED; + } + + uint32_t *ptr; + ptr = efm32x_info->lb_page + 127; + *ptr = 0; + + retval = efm32x_write_lock_data(bank); + if (ERROR_OK != retval) { + LOG_ERROR("Failed to write LB page"); + return retval; + } + + command_print(CMD_CTX, "efm32x debug interface locked, reset the device to apply"); return ERROR_OK; } static const struct command_registration efm32x_exec_command_handlers[] = { + { + .name = "debuglock", + .handler = efm32x_handle_debuglock_command, + .mode = COMMAND_EXEC, + .usage = "bank_id", + .help = "Lock the debug interface of the device.", + }, COMMAND_REGISTRATION_DONE };