target/stm32f1: clang-format and code styling for better readability
Signed-off-by: Rafael Silva <perigoso@riseup.net>
This commit is contained in:
Rafael Silva
Rachel Mant
parent
5666fa2a2f
commit
90ed4fe31a
|
|
@ -45,30 +45,27 @@ static bool stm32f1_cmd_option(target *t, int argc, const char **argv);
|
|||
const struct command_s stm32f1_cmd_list[] = {
|
||||
{"erase_mass", (cmd_handler)stm32f1_cmd_erase_mass, "Erase entire flash memory"},
|
||||
{"option", (cmd_handler)stm32f1_cmd_option, "Manipulate option bytes"},
|
||||
{NULL, NULL, NULL}
|
||||
{NULL, NULL, NULL},
|
||||
};
|
||||
|
||||
|
||||
static int stm32f1_flash_erase(struct target_flash *f,
|
||||
target_addr addr, size_t len);
|
||||
static int stm32f1_flash_write(struct target_flash *f,
|
||||
target_addr dest, const void *src, size_t len);
|
||||
static int stm32f1_flash_erase(struct target_flash *f, target_addr addr, size_t len);
|
||||
static int stm32f1_flash_write(struct target_flash *f, target_addr dest, const void *src, size_t len);
|
||||
|
||||
/* Flash Program ad Erase Controller Register Map */
|
||||
#define FPEC_BASE 0x40022000
|
||||
#define FLASH_ACR (FPEC_BASE+0x00)
|
||||
#define FLASH_KEYR (FPEC_BASE+0x04)
|
||||
#define FLASH_OPTKEYR (FPEC_BASE+0x08)
|
||||
#define FLASH_SR (FPEC_BASE+0x0C)
|
||||
#define FLASH_CR (FPEC_BASE+0x10)
|
||||
#define FLASH_AR (FPEC_BASE+0x14)
|
||||
#define FLASH_OBR (FPEC_BASE+0x1C)
|
||||
#define FLASH_WRPR (FPEC_BASE+0x20)
|
||||
#define FLASH_ACR (FPEC_BASE + 0x00)
|
||||
#define FLASH_KEYR (FPEC_BASE + 0x04)
|
||||
#define FLASH_OPTKEYR (FPEC_BASE + 0x08)
|
||||
#define FLASH_SR (FPEC_BASE + 0x0C)
|
||||
#define FLASH_CR (FPEC_BASE + 0x10)
|
||||
#define FLASH_AR (FPEC_BASE + 0x14)
|
||||
#define FLASH_OBR (FPEC_BASE + 0x1C)
|
||||
#define FLASH_WRPR (FPEC_BASE + 0x20)
|
||||
|
||||
#define FLASH_BANK2_OFFSET 0x40
|
||||
#define FLASH_BANK_SPLIT 0x08080000
|
||||
|
||||
#define FLASH_CR_OBL_LAUNCH (1<<13)
|
||||
#define FLASH_CR_OBL_LAUNCH (1 << 13)
|
||||
#define FLASH_CR_OPTWRE (1 << 9)
|
||||
#define FLASH_CR_LOCK (1 << 7)
|
||||
#define FLASH_CR_STRT (1 << 6)
|
||||
|
|
@ -98,8 +95,7 @@ static int stm32f1_flash_write(struct target_flash *f,
|
|||
#define FLASHSIZE 0x1FFFF7E0
|
||||
#define FLASHSIZE_F0 0x1FFFF7CC
|
||||
|
||||
static void stm32f1_add_flash(target *t,
|
||||
uint32_t addr, size_t length, size_t erasesize)
|
||||
static void stm32f1_add_flash(target *t, uint32_t addr, size_t length, size_t erasesize)
|
||||
{
|
||||
struct target_flash *f = calloc(1, sizeof(*f));
|
||||
if (!f) { /* calloc failed: heap exhaustion */
|
||||
|
|
@ -124,14 +120,17 @@ static void stm32f1_add_flash(target *t,
|
|||
bool gd32f1_probe(target *t)
|
||||
{
|
||||
uint16_t stored_idcode = t->idcode;
|
||||
|
||||
if ((t->cpuid & CPUID_PARTNO_MASK) == CORTEX_M23)
|
||||
t->idcode = target_mem_read32(t, DBGMCU_IDCODE_F0) & 0xfff;
|
||||
else
|
||||
t->idcode = target_mem_read32(t, DBGMCU_IDCODE) & 0xfff;
|
||||
uint32_t signature= target_mem_read32(t, FLASHSIZE);
|
||||
uint32_t flashSize=signature & 0xFFFF;
|
||||
uint32_t ramSize=signature >>16 ;
|
||||
switch(t->idcode) {
|
||||
|
||||
uint32_t signature = target_mem_read32(t, FLASHSIZE);
|
||||
uint32_t flashSize = signature & 0xFFFF;
|
||||
uint32_t ramSize = signature >> 16;
|
||||
|
||||
switch (t->idcode) {
|
||||
case 0x414: /* Gigadevice gd32f303 */
|
||||
case 0x430:
|
||||
t->driver = "GD32F3";
|
||||
|
|
@ -146,25 +145,30 @@ bool gd32f1_probe(target *t)
|
|||
t->idcode = stored_idcode;
|
||||
return false;
|
||||
}
|
||||
target_add_ram(t, 0x20000000, ramSize*1024);
|
||||
stm32f1_add_flash(t, 0x8000000, flashSize*1024, 0x400);
|
||||
|
||||
target_add_ram(t, 0x20000000, ramSize * 1024);
|
||||
stm32f1_add_flash(t, 0x8000000, flashSize * 1024, 0x400);
|
||||
target_add_commands(t, stm32f1_cmd_list, t->driver);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
\brief identify the stm32f1 chip
|
||||
*/
|
||||
|
||||
bool stm32f1_probe(target *t)
|
||||
{
|
||||
uint16_t stored_idcode = t->idcode;
|
||||
|
||||
if ((t->cpuid & CPUID_PARTNO_MASK) == CORTEX_M0)
|
||||
t->idcode = target_mem_read32(t, DBGMCU_IDCODE_F0) & 0xfff;
|
||||
else
|
||||
t->idcode = target_mem_read32(t, DBGMCU_IDCODE) & 0xfff;
|
||||
|
||||
size_t flash_size;
|
||||
size_t block_size = 0x400;
|
||||
switch(t->idcode) {
|
||||
|
||||
switch (t->idcode) {
|
||||
case 0x29b: /* CS clone */
|
||||
case 0x410: /* Medium density */
|
||||
case 0x412: /* Low density */
|
||||
|
|
@ -183,6 +187,7 @@ bool stm32f1_probe(target *t)
|
|||
t->driver = "STM32F1 medium density";
|
||||
}
|
||||
return true;
|
||||
|
||||
case 0x414: /* High density */
|
||||
case 0x418: /* Connectivity Line */
|
||||
case 0x428: /* Value Line, High Density */
|
||||
|
|
@ -191,6 +196,7 @@ bool stm32f1_probe(target *t)
|
|||
stm32f1_add_flash(t, 0x8000000, 0x80000, 0x800);
|
||||
target_add_commands(t, stm32f1_cmd_list, "STM32 HF/CL/VL-HD");
|
||||
return true;
|
||||
|
||||
case 0x430: /* XL-density */
|
||||
t->driver = "STM32F1 XL density";
|
||||
target_add_ram(t, 0x20000000, 0x18000);
|
||||
|
|
@ -204,6 +210,7 @@ bool stm32f1_probe(target *t)
|
|||
case 0x446: /* STM32F303xD/E and STM32F398xE */
|
||||
target_add_ram(t, 0x10000000, 0x4000);
|
||||
/* fall through */
|
||||
|
||||
case 0x432: /* STM32F37x */
|
||||
case 0x439: /* STM32F302C8 */
|
||||
t->driver = "STM32F3";
|
||||
|
|
@ -211,28 +218,34 @@ bool stm32f1_probe(target *t)
|
|||
stm32f1_add_flash(t, 0x8000000, 0x80000, 0x800);
|
||||
target_add_commands(t, stm32f1_cmd_list, "STM32F3");
|
||||
return true;
|
||||
|
||||
case 0x444: /* STM32F03 RM0091 Rev.7, STM32F030x[4|6] RM0360 Rev. 4*/
|
||||
t->driver = "STM32F03";
|
||||
flash_size = 0x8000;
|
||||
break;
|
||||
|
||||
case 0x445: /* STM32F04 RM0091 Rev.7, STM32F070x6 RM0360 Rev. 4*/
|
||||
t->driver = "STM32F04/F070x6";
|
||||
flash_size = 0x8000;
|
||||
break;
|
||||
|
||||
case 0x440: /* STM32F05 RM0091 Rev.7, STM32F030x8 RM0360 Rev. 4*/
|
||||
t->driver = "STM32F05/F030x8";
|
||||
flash_size = 0x10000;
|
||||
break;
|
||||
|
||||
case 0x448: /* STM32F07 RM0091 Rev.7, STM32F070xB RM0360 Rev. 4*/
|
||||
t->driver = "STM32F07";
|
||||
flash_size = 0x20000;
|
||||
block_size = 0x800;
|
||||
break;
|
||||
|
||||
case 0x442: /* STM32F09 RM0091 Rev.7, STM32F030xC RM0360 Rev. 4*/
|
||||
t->driver = "STM32F09/F030xC";
|
||||
flash_size = 0x40000;
|
||||
block_size = 0x800;
|
||||
break;
|
||||
|
||||
default: /* NONE */
|
||||
t->idcode = stored_idcode;
|
||||
return false;
|
||||
|
|
@ -241,6 +254,7 @@ bool stm32f1_probe(target *t)
|
|||
target_add_ram(t, 0x20000000, 0x5000);
|
||||
stm32f1_add_flash(t, 0x8000000, flash_size, block_size);
|
||||
target_add_commands(t, stm32f1_cmd_list, "STM32F0");
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -253,11 +267,11 @@ static int stm32f1_flash_unlock(target *t, uint32_t bank_offset)
|
|||
DEBUG_WARN("unlock failed, cr: 0x%08" PRIx32 "\n", cr);
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int stm32f1_flash_erase(struct target_flash *f,
|
||||
target_addr addr, size_t len)
|
||||
static int stm32f1_flash_erase(struct target_flash *f, target_addr addr, size_t len)
|
||||
{
|
||||
target *t = f->t;
|
||||
target_addr end = addr + len - 1;
|
||||
|
|
@ -266,31 +280,36 @@ static int stm32f1_flash_erase(struct target_flash *f,
|
|||
if ((t->idcode == 0x430) && (end >= FLASH_BANK_SPLIT))
|
||||
if (stm32f1_flash_unlock(t, FLASH_BANK2_OFFSET))
|
||||
return -1;
|
||||
|
||||
if (addr < FLASH_BANK_SPLIT)
|
||||
if (stm32f1_flash_unlock(t, 0))
|
||||
return -1;
|
||||
while(len) {
|
||||
|
||||
while (len) {
|
||||
uint32_t bank_offset = 0;
|
||||
if (addr >= FLASH_BANK_SPLIT)
|
||||
bank_offset = FLASH_BANK2_OFFSET;
|
||||
|
||||
/* Flash page erase instruction */
|
||||
target_mem_write32(t, FLASH_CR + bank_offset, FLASH_CR_PER);
|
||||
/* write address to FMA */
|
||||
target_mem_write32(t, FLASH_AR + bank_offset, addr);
|
||||
/* Flash page erase start instruction */
|
||||
target_mem_write32(t, FLASH_CR + bank_offset,
|
||||
FLASH_CR_STRT | FLASH_CR_PER);
|
||||
target_mem_write32(t, FLASH_CR + bank_offset, FLASH_CR_STRT | FLASH_CR_PER);
|
||||
|
||||
/* Read FLASH_SR to poll for BSY bit */
|
||||
while (target_mem_read32(t, FLASH_SR + bank_offset) & FLASH_SR_BSY)
|
||||
if(target_check_error(t)) {
|
||||
while (target_mem_read32(t, FLASH_SR + bank_offset) & FLASH_SR_BSY) {
|
||||
if (target_check_error(t)) {
|
||||
DEBUG_WARN("stm32f1 flash erase: comm error\n");
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
if (len > f->blocksize)
|
||||
len -= f->blocksize;
|
||||
else
|
||||
len = 0;
|
||||
|
||||
addr += f->blocksize;
|
||||
}
|
||||
|
||||
|
|
@ -309,27 +328,30 @@ static int stm32f1_flash_erase(struct target_flash *f,
|
|||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int stm32f1_flash_write(struct target_flash *f,
|
||||
target_addr dest, const void *src, size_t len)
|
||||
static int stm32f1_flash_write(struct target_flash *f, target_addr dest, const void *src, size_t len)
|
||||
{
|
||||
target *t = f->t;
|
||||
uint32_t sr;
|
||||
size_t length = 0;
|
||||
|
||||
if (dest < FLASH_BANK_SPLIT) {
|
||||
if ((dest + len - 1) >= FLASH_BANK_SPLIT)
|
||||
length = FLASH_BANK_SPLIT - dest;
|
||||
else
|
||||
length = len;
|
||||
|
||||
target_mem_write32(t, FLASH_CR, FLASH_CR_PG);
|
||||
cortexm_mem_write_sized(t, dest, src, length, ALIGN_HALFWORD);
|
||||
|
||||
/* Read FLASH_SR to poll for BSY bit */
|
||||
/* Wait for completion or an error */
|
||||
do {
|
||||
sr = target_mem_read32(t, FLASH_SR);
|
||||
if(target_check_error(t)) {
|
||||
if (target_check_error(t)) {
|
||||
DEBUG_WARN("stm32f1 flash write: comm error\n");
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -342,6 +364,7 @@ static int stm32f1_flash_write(struct target_flash *f,
|
|||
dest += length;
|
||||
src += length;
|
||||
}
|
||||
|
||||
length = len - length;
|
||||
if ((t->idcode == 0x430) && length) { /* Write on bank 2 */
|
||||
target_mem_write32(t, FLASH_CR + FLASH_BANK2_OFFSET, FLASH_CR_PG);
|
||||
|
|
@ -350,7 +373,7 @@ static int stm32f1_flash_write(struct target_flash *f,
|
|||
/* Wait for completion or an error */
|
||||
do {
|
||||
sr = target_mem_read32(t, FLASH_SR + FLASH_BANK2_OFFSET);
|
||||
if(target_check_error(t)) {
|
||||
if (target_check_error(t)) {
|
||||
DEBUG_WARN("stm32f1 flash bank2 write: comm error\n");
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -361,6 +384,7 @@ static int stm32f1_flash_write(struct target_flash *f,
|
|||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -368,6 +392,7 @@ static bool stm32f1_cmd_erase_mass(target *t, int argc, const char **argv)
|
|||
{
|
||||
(void)argc;
|
||||
(void)argv;
|
||||
|
||||
if (stm32f1_flash_unlock(t, 0))
|
||||
return false;
|
||||
|
||||
|
|
@ -377,31 +402,33 @@ static bool stm32f1_cmd_erase_mass(target *t, int argc, const char **argv)
|
|||
|
||||
/* Read FLASH_SR to poll for BSY bit */
|
||||
while (target_mem_read32(t, FLASH_SR) & FLASH_SR_BSY)
|
||||
if(target_check_error(t))
|
||||
if (target_check_error(t))
|
||||
return false;
|
||||
|
||||
/* Check for error */
|
||||
uint16_t sr = target_mem_read32(t, FLASH_SR);
|
||||
if ((sr & SR_ERROR_MASK) || !(sr & SR_EOP))
|
||||
return false;
|
||||
|
||||
if (t->idcode == 0x430) {
|
||||
if (stm32f1_flash_unlock(t, FLASH_BANK2_OFFSET))
|
||||
return false;
|
||||
|
||||
/* Flash mass erase start instruction on bank 2*/
|
||||
target_mem_write32(t, FLASH_CR + FLASH_BANK2_OFFSET, FLASH_CR_MER);
|
||||
target_mem_write32(t, FLASH_CR + FLASH_BANK2_OFFSET,
|
||||
FLASH_CR_STRT | FLASH_CR_MER);
|
||||
target_mem_write32(t, FLASH_CR + FLASH_BANK2_OFFSET, FLASH_CR_STRT | FLASH_CR_MER);
|
||||
|
||||
/* Read FLASH_SR to poll for BSY bit */
|
||||
while (target_mem_read32(t, FLASH_SR + FLASH_BANK2_OFFSET) & FLASH_SR_BSY)
|
||||
if(target_check_error(t))
|
||||
if (target_check_error(t))
|
||||
return false;
|
||||
|
||||
/* Check for error */
|
||||
sr = target_mem_read32(t, FLASH_SR + FLASH_BANK2_OFFSET);
|
||||
if ((sr & SR_ERROR_MASK) || !(sr & SR_EOP))
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -409,12 +436,13 @@ static bool stm32f1_option_erase(target *t)
|
|||
{
|
||||
/* Erase option bytes instruction */
|
||||
target_mem_write32(t, FLASH_CR, FLASH_CR_OPTER | FLASH_CR_OPTWRE);
|
||||
target_mem_write32(t, FLASH_CR,
|
||||
FLASH_CR_STRT | FLASH_CR_OPTER | FLASH_CR_OPTWRE);
|
||||
target_mem_write32(t, FLASH_CR, FLASH_CR_STRT | FLASH_CR_OPTER | FLASH_CR_OPTWRE);
|
||||
|
||||
/* Read FLASH_SR to poll for BSY bit */
|
||||
while (target_mem_read32(t, FLASH_SR) & FLASH_SR_BSY)
|
||||
if(target_check_error(t))
|
||||
if (target_check_error(t))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -422,13 +450,15 @@ static bool stm32f1_option_write_erased(target *t, uint32_t addr, uint16_t value
|
|||
{
|
||||
if (value == 0xffff)
|
||||
return true;
|
||||
|
||||
/* Erase option bytes instruction */
|
||||
target_mem_write32(t, FLASH_CR, FLASH_CR_OPTPG | FLASH_CR_OPTWRE);
|
||||
target_mem_write16(t, addr, value);
|
||||
/* Read FLASH_SR to poll for BSY bit */
|
||||
while (target_mem_read32(t, FLASH_SR) & FLASH_SR_BSY)
|
||||
if(target_check_error(t))
|
||||
if (target_check_error(t))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -441,10 +471,10 @@ static bool stm32f1_option_write(target *t, uint32_t addr, uint16_t value)
|
|||
if ((index < 0) || (index > 7))
|
||||
return false;
|
||||
/* Retrieve old values */
|
||||
for (i = 0; i < 16; i = i +4) {
|
||||
for (i = 0; i < 16; i = i + 4) {
|
||||
uint32_t val = target_mem_read32(t, FLASH_OBP_RDP + i);
|
||||
opt_val[i/2] = val & 0xffff;
|
||||
opt_val[i/2 +1] = val >> 16;
|
||||
opt_val[i / 2] = val & 0xffff;
|
||||
opt_val[i / 2 + 1] = val >> 16;
|
||||
}
|
||||
if (opt_val[index] == value)
|
||||
return true;
|
||||
|
|
@ -455,8 +485,7 @@ static bool stm32f1_option_write(target *t, uint32_t addr, uint16_t value)
|
|||
opt_val[index] = value;
|
||||
/* Write changed values*/
|
||||
for (i = 0; i < 8; i++)
|
||||
if (!(stm32f1_option_write_erased
|
||||
(t, FLASH_OBP_RDP + i*2,opt_val[i])))
|
||||
if (!(stm32f1_option_write_erased(t, FLASH_OBP_RDP + i * 2, opt_val[i])))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
|
@ -467,7 +496,7 @@ static bool stm32f1_cmd_option(target *t, int argc, const char **argv)
|
|||
uint32_t flash_obp_rdp_key;
|
||||
uint32_t rdprt;
|
||||
|
||||
switch(t->idcode) {
|
||||
switch (t->idcode) {
|
||||
case 0x422: /* STM32F30x */
|
||||
case 0x432: /* STM32F37x */
|
||||
case 0x438: /* STM32F303x6/8 and STM32F328 */
|
||||
|
|
@ -478,11 +507,15 @@ static bool stm32f1_cmd_option(target *t, int argc, const char **argv)
|
|||
case 0x442: /* STM32F09 RM0091 Rev.7, STM32F030xC RM0360 Rev. 4*/
|
||||
flash_obp_rdp_key = FLASH_OBP_RDP_KEY_F3;
|
||||
break;
|
||||
default: flash_obp_rdp_key = FLASH_OBP_RDP_KEY;
|
||||
default:
|
||||
flash_obp_rdp_key = FLASH_OBP_RDP_KEY;
|
||||
}
|
||||
|
||||
rdprt = target_mem_read32(t, FLASH_OBR) & FLASH_OBR_RDPRT;
|
||||
|
||||
if (stm32f1_flash_unlock(t, 0))
|
||||
return false;
|
||||
|
||||
target_mem_write32(t, FLASH_OPTKEYR, KEY1);
|
||||
target_mem_write32(t, FLASH_OPTKEYR, KEY2);
|
||||
|
||||
|
|
@ -517,5 +550,6 @@ static bool stm32f1_cmd_option(target *t, int argc, const char **argv)
|
|||
tc_printf(t, "0x%08X: 0x%04X\n", addr, val & 0xFFFF);
|
||||
tc_printf(t, "0x%08X: 0x%04X\n", addr + 2, val >> 16);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue