interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

stm32f1x: use register base instead of register offset 

Access the different flash banks' registers using a bank specific register
base and a register specific offset. This is equivalent but feels more
natural.

Some accesses were discovered that maybe should not be hard coded to bank0
registers. Add a note about that.

Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
This commit is contained in:
Andreas Fritiofson 2011-07-17 14:07:26 +02:00
parent 1163435e19
commit a147563ac1
1 changed files with 51 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/flash/nor/stm32f1x.c
View File

@ -31,14 +31,29 @@
/* stm32x register locations */ /* stm32x register locations */
#define STM32_FLASH_ACR 0x40022000 #define FLASH_REG_BASE_B0 0x40022000
#define STM32_FLASH_KEYR 0x40022004 #define FLASH_REG_BASE_B1 0x40022040
#define STM32_FLASH_OPTKEYR 0x40022008
#define STM32_FLASH_SR 0x4002200C #define STM32_FLASH_ACR 0x00
#define STM32_FLASH_CR 0x40022010 #define STM32_FLASH_KEYR 0x04
#define STM32_FLASH_AR 0x40022014 #define STM32_FLASH_OPTKEYR 0x08
#define STM32_FLASH_OBR 0x4002201C #define STM32_FLASH_SR 0x0C
#define STM32_FLASH_WRPR 0x40022020 #define STM32_FLASH_CR 0x10
#define STM32_FLASH_AR 0x14
#define STM32_FLASH_OBR 0x1C
#define STM32_FLASH_WRPR 0x20
/* TODO: Check if code using these really should be hard coded to bank 0.
* There are valid cases, on dual flash devices the protection of the
* second bank is done on the bank0 reg's. */
#define STM32_FLASH_ACR_B0 0x40022000
#define STM32_FLASH_KEYR_B0 0x40022004
#define STM32_FLASH_OPTKEYR_B0 0x40022008
#define STM32_FLASH_SR_B0 0x4002200C
#define STM32_FLASH_CR_B0 0x40022010
#define STM32_FLASH_AR_B0 0x40022014
#define STM32_FLASH_OBR_B0 0x4002201C
#define STM32_FLASH_WRPR_B0 0x40022020
/* option byte location */ /* option byte location */
@ -83,12 +98,6 @@
#define KEY1 0x45670123 #define KEY1 0x45670123
#define KEY2 0xCDEF89AB #define KEY2 0xCDEF89AB
/* we use an offset to access the second bank on dual flash devices
* strangely the protection of the second bank is done on the bank0 reg's */
#define FLASH_OFFSET_B0 0x00
#define FLASH_OFFSET_B1 0x40
struct stm32x_options struct stm32x_options
{ {
uint16_t RDP; uint16_t RDP;
@ -104,10 +113,8 @@ struct stm32x_flash_bank
int probed; int probed;
bool has_dual_banks; bool has_dual_banks;
/* used to access dual flash bank stm32xl /* used to access dual flash bank stm32xl */
* 0x00 will address bank 0 flash uint32_t register_base;
* 0x40 will address bank 1 flash */
int register_offset;
}; };
static int stm32x_mass_erase(struct flash_bank *bank); static int stm32x_mass_erase(struct flash_bank *bank);
@ -130,7 +137,7 @@ FLASH_BANK_COMMAND_HANDLER(stm32x_flash_bank_command)
stm32x_info->write_algorithm = NULL; stm32x_info->write_algorithm = NULL;
stm32x_info->probed = 0; stm32x_info->probed = 0;
stm32x_info->has_dual_banks = false; stm32x_info->has_dual_banks = false;
stm32x_info->register_offset = FLASH_OFFSET_B0; stm32x_info->register_base = FLASH_REG_BASE_B0;
return ERROR_OK; return ERROR_OK;
} }
@ -138,7 +145,7 @@ FLASH_BANK_COMMAND_HANDLER(stm32x_flash_bank_command)
static inline int stm32x_get_flash_reg(struct flash_bank *bank, uint32_t reg) static inline int stm32x_get_flash_reg(struct flash_bank *bank, uint32_t reg)
{ {
struct stm32x_flash_bank *stm32x_info = bank->driver_priv; struct stm32x_flash_bank *stm32x_info = bank->driver_priv;
return reg + stm32x_info->register_offset; return reg + stm32x_info->register_base;
} }
static inline int stm32x_get_flash_status(struct flash_bank *bank, uint32_t *status) static inline int stm32x_get_flash_status(struct flash_bank *bank, uint32_t *status)
@ -200,7 +207,7 @@ int stm32x_check_operation_supported(struct flash_bank *bank)
/* if we have a dual flash bank device then /* if we have a dual flash bank device then
* we need to perform option byte stuff on bank0 only */ * we need to perform option byte stuff on bank0 only */
if (stm32x_info->register_offset != FLASH_OFFSET_B0) if (stm32x_info->register_base != FLASH_REG_BASE_B0)
{ {
LOG_ERROR("Option Byte Operation's must use bank0"); LOG_ERROR("Option Byte Operation's must use bank0");
return ERROR_FLASH_OPERATION_FAILED; return ERROR_FLASH_OPERATION_FAILED;
@ -218,7 +225,7 @@ static int stm32x_read_options(struct flash_bank *bank)
stm32x_info = bank->driver_priv; stm32x_info = bank->driver_priv;
/* read current option bytes */ /* read current option bytes */
int retval = target_read_u32(target, STM32_FLASH_OBR, &optiondata); int retval = target_read_u32(target, STM32_FLASH_OBR_B0, &optiondata);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -229,7 +236,7 @@ static int stm32x_read_options(struct flash_bank *bank)
LOG_INFO("Device Security Bit Set"); LOG_INFO("Device Security Bit Set");
/* each bit refers to a 4bank protection */ /* each bit refers to a 4bank protection */
retval = target_read_u32(target, STM32_FLASH_WRPR, &optiondata); retval = target_read_u32(target, STM32_FLASH_WRPR_B0, &optiondata);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -252,27 +259,27 @@ static int stm32x_erase_options(struct flash_bank *bank)
stm32x_read_options(bank); stm32x_read_options(bank);
/* unlock flash registers */ /* unlock flash registers */
int retval = target_write_u32(target, STM32_FLASH_KEYR, KEY1); int retval = target_write_u32(target, STM32_FLASH_KEYR_B0, KEY1);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
retval = target_write_u32(target, STM32_FLASH_KEYR, KEY2); retval = target_write_u32(target, STM32_FLASH_KEYR_B0, KEY2);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
/* unlock option flash registers */ /* unlock option flash registers */
retval = target_write_u32(target, STM32_FLASH_OPTKEYR, KEY1); retval = target_write_u32(target, STM32_FLASH_OPTKEYR_B0, KEY1);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
retval = target_write_u32(target, STM32_FLASH_OPTKEYR, KEY2); retval = target_write_u32(target, STM32_FLASH_OPTKEYR_B0, KEY2);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
/* erase option bytes */ /* erase option bytes */
retval = target_write_u32(target, STM32_FLASH_CR, FLASH_OPTER | FLASH_OPTWRE); retval = target_write_u32(target, STM32_FLASH_CR_B0, FLASH_OPTER | FLASH_OPTWRE);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
retval = target_write_u32(target, STM32_FLASH_CR, FLASH_OPTER | FLASH_STRT | FLASH_OPTWRE); retval = target_write_u32(target, STM32_FLASH_CR_B0, FLASH_OPTER | FLASH_STRT | FLASH_OPTWRE);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -295,23 +302,23 @@ static int stm32x_write_options(struct flash_bank *bank)
stm32x_info = bank->driver_priv; stm32x_info = bank->driver_priv;
/* unlock flash registers */ /* unlock flash registers */
int retval = target_write_u32(target, STM32_FLASH_KEYR, KEY1); int retval = target_write_u32(target, STM32_FLASH_KEYR_B0, KEY1);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
retval = target_write_u32(target, STM32_FLASH_KEYR, KEY2); retval = target_write_u32(target, STM32_FLASH_KEYR_B0, KEY2);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
/* unlock option flash registers */ /* unlock option flash registers */
retval = target_write_u32(target, STM32_FLASH_OPTKEYR, KEY1); retval = target_write_u32(target, STM32_FLASH_OPTKEYR_B0, KEY1);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
retval = target_write_u32(target, STM32_FLASH_OPTKEYR, KEY2); retval = target_write_u32(target, STM32_FLASH_OPTKEYR_B0, KEY2);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
/* program option bytes */ /* program option bytes */
retval = target_write_u32(target, STM32_FLASH_CR, FLASH_OPTPG | FLASH_OPTWRE); retval = target_write_u32(target, STM32_FLASH_CR_B0, FLASH_OPTPG | FLASH_OPTWRE);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -369,7 +376,7 @@ static int stm32x_write_options(struct flash_bank *bank)
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
retval = target_write_u32(target, STM32_FLASH_CR, FLASH_LOCK); retval = target_write_u32(target, STM32_FLASH_CR_B0, FLASH_LOCK);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -398,7 +405,7 @@ static int stm32x_protect_check(struct flash_bank *bank)
/* medium density - each bit refers to a 4bank protection /* medium density - each bit refers to a 4bank protection
* high density - each bit refers to a 2bank protection */ * high density - each bit refers to a 2bank protection */
retval = target_read_u32(target, STM32_FLASH_WRPR, &protection); retval = target_read_u32(target, STM32_FLASH_WRPR_B0, &protection);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -544,7 +551,7 @@ static int stm32x_protect(struct flash_bank *bank, int set, int first, int last)
/* medium density - each bit refers to a 4bank protection /* medium density - each bit refers to a 4bank protection
* high density - each bit refers to a 2bank protection */ * high density - each bit refers to a 2bank protection */
retval = target_read_u32(target, STM32_FLASH_WRPR, &protection); retval = target_read_u32(target, STM32_FLASH_WRPR_B0, &protection);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -695,7 +702,7 @@ static int stm32x_write_block(struct flash_bank *bank, uint8_t *buffer,
buf_set_u32(reg_params[0].value, 0, 32, source->address); buf_set_u32(reg_params[0].value, 0, 32, source->address);
buf_set_u32(reg_params[1].value, 0, 32, address); buf_set_u32(reg_params[1].value, 0, 32, address);
buf_set_u32(reg_params[2].value, 0, 32, thisrun_count); buf_set_u32(reg_params[2].value, 0, 32, thisrun_count);
buf_set_u32(reg_params[3].value, 0, 32, stm32x_info->register_offset); buf_set_u32(reg_params[3].value, 0, 32, stm32x_info->register_base - FLASH_REG_BASE_B0);
if ((retval = target_run_algorithm(target, 0, NULL, 4, reg_params, if ((retval = target_run_algorithm(target, 0, NULL, 4, reg_params,
stm32x_info->write_algorithm->address, stm32x_info->write_algorithm->address,
@ -710,7 +717,7 @@ static int stm32x_write_block(struct flash_bank *bank, uint8_t *buffer,
{ {
LOG_ERROR("flash memory not erased before writing"); LOG_ERROR("flash memory not erased before writing");
/* Clear but report errors */ /* Clear but report errors */
target_write_u32(target, STM32_FLASH_SR, FLASH_PGERR); target_write_u32(target, STM32_FLASH_SR_B0, FLASH_PGERR);
retval = ERROR_FAIL; retval = ERROR_FAIL;
break; break;
} }
@ -719,7 +726,7 @@ static int stm32x_write_block(struct flash_bank *bank, uint8_t *buffer,
{ {
LOG_ERROR("flash memory write protected"); LOG_ERROR("flash memory write protected");
/* Clear but report errors */ /* Clear but report errors */
target_write_u32(target, STM32_FLASH_SR, FLASH_WRPRTERR); target_write_u32(target, STM32_FLASH_SR_B0, FLASH_WRPRTERR);
retval = ERROR_FAIL; retval = ERROR_FAIL;
break; break;
} }
@ -832,7 +839,7 @@ static int stm32x_write(struct flash_bank *bank, uint8_t *buffer,
return retval; return retval;
} }
return target_write_u32(target, STM32_FLASH_CR, FLASH_LOCK); return target_write_u32(target, STM32_FLASH_CR_B0, FLASH_LOCK);
} }
static int stm32x_probe(struct flash_bank *bank) static int stm32x_probe(struct flash_bank *bank)
@ -846,7 +853,7 @@ static int stm32x_probe(struct flash_bank *bank)
uint32_t base_address = 0x08000000; uint32_t base_address = 0x08000000;
stm32x_info->probed = 0; stm32x_info->probed = 0;
stm32x_info->register_offset = FLASH_OFFSET_B0; stm32x_info->register_base = FLASH_REG_BASE_B0;
/* read stm32 device id register */ /* read stm32 device id register */
int retval = target_read_u32(target, 0xE0042000, &device_id); int retval = target_read_u32(target, 0xE0042000, &device_id);
@ -980,7 +987,7 @@ static int stm32x_probe(struct flash_bank *bank)
{ {
num_pages -= 512; num_pages -= 512;
/* bank1 also uses a register offset */ /* bank1 also uses a register offset */
stm32x_info->register_offset = FLASH_OFFSET_B1; stm32x_info->register_base = FLASH_REG_BASE_B1;
base_address = 0x08080000; base_address = 0x08080000;
} }
} }
@ -1328,7 +1335,7 @@ COMMAND_HANDLER(stm32x_handle_options_read_command)
if (ERROR_OK != retval) if (ERROR_OK != retval)
return retval; return retval;
retval = target_read_u32(target, STM32_FLASH_OBR, &optionbyte); retval = target_read_u32(target, STM32_FLASH_OBR_B0, &optionbyte);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
command_print(CMD_CTX, "Option Byte: 0x%" PRIx32 "", optionbyte); command_print(CMD_CTX, "Option Byte: 0x%" PRIx32 "", optionbyte);