michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: flash: stm32h7: ensure option bytes write

Browse source 
Make sure to submit a change of option bytes and wait for the end of
the operation. It is done by checking the OPT_BUSY bit.

Signed-off-by: Dawid Niedzwiecki <dawidn@google.com>
This commit is contained in:
Dawid Niedzwiecki 2025-01-23 10:32:31 +01:00 • committed by Benjamin Cabé
commit 8c97ba8017
1 changed files with 45 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

60
drivers/flash/flash_stm32h7x.c
View file

@ -34,6 +34,8 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
* completed. * completed.
*/ */
#define STM32H7_FLASH_TIMEOUT (2 * DT_PROP(DT_INST(0, st_stm32_nv_flash), max_erase_time)) #define STM32H7_FLASH_TIMEOUT (2 * DT_PROP(DT_INST(0, st_stm32_nv_flash), max_erase_time))
/* No information in documentation about that. */
#define STM32H7_FLASH_OPT_TIMEOUT_MS 800
#define STM32H7_M4_FLASH_SIZE DT_PROP_OR(DT_INST(0, st_stm32_nv_flash), bank2_flash_size, 0) #define STM32H7_M4_FLASH_SIZE DT_PROP_OR(DT_INST(0, st_stm32_nv_flash), bank2_flash_size, 0)
#ifdef CONFIG_CPU_CORTEX_M4 #ifdef CONFIG_CPU_CORTEX_M4
@ -62,41 +64,65 @@ struct flash_stm32_sector_t {
volatile uint32_t *sr; volatile uint32_t *sr;
}; };
static __unused int write_optsr(const struct device *dev, uint32_t mask, uint32_t value) static __unused int commit_optb(const struct device *dev)
{ {
FLASH_TypeDef *regs = FLASH_STM32_REGS(dev); FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
int rc; int64_t timeout_time = k_uptime_get() + STM32H7_FLASH_OPT_TIMEOUT_MS;
regs->OPTCR |= FLASH_OPTCR_OPTSTART;
barrier_dsync_fence_full();
while (regs->OPTSR_CUR & FLASH_OPTSR_OPT_BUSY) {
if (k_uptime_get() > timeout_time) {
LOG_ERR("Timeout writing option bytes.");
return -ETIMEDOUT;
}
}
return 0;
}
static __unused int write_opt(const struct device *dev, uint32_t mask, uint32_t value,
uintptr_t cur, bool commit)
{
FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
/* PRG register always follows CUR register. */
uintptr_t prg = cur + 4;
int rc = 0;
if (regs->OPTCR & FLASH_OPTCR_OPTLOCK) { if (regs->OPTCR & FLASH_OPTCR_OPTLOCK) {
LOG_ERR("Option bytes locked"); LOG_ERR("Option bytes locked");
return -EIO; return -EIO;
} }
if ((regs->OPTSR_CUR & mask) == value) { rc = flash_stm32_wait_flash_idle(dev);
/* Done already */ if (rc < 0) {
LOG_ERR("Err flash no idle");
return rc;
}
if ((sys_read32(cur) & mask) == value) {
return 0; return 0;
} }
rc = flash_stm32_wait_flash_idle(dev); sys_write32((sys_read32(cur) & ~mask) | value, prg);
if (rc < 0) {
LOG_ERR("Err flash no idle");
return rc;
}
regs->OPTSR_PRG = (regs->OPTSR_CUR & ~mask) | value; if (commit) {
regs->OPTCR |= FLASH_OPTCR_OPTSTART; /* Make sure previous write is completed before committing option bytes. */
/* Make sure previous write is completed. */
barrier_dsync_fence_full(); barrier_dsync_fence_full();
rc = commit_optb(dev);
rc = flash_stm32_wait_flash_idle(dev);
if (rc < 0) {
LOG_ERR("Err flash no idle");
return rc;
} }
return rc; return rc;
} }
static __unused int write_optsr(const struct device *dev, uint32_t mask, uint32_t value)
{
FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
uintptr_t cur = (uintptr_t)regs + offsetof(FLASH_TypeDef, OPTSR_CUR);
return write_opt(dev, mask, value, cur, true);
}
#if defined(CONFIG_FLASH_STM32_READOUT_PROTECTION) #if defined(CONFIG_FLASH_STM32_READOUT_PROTECTION)
uint8_t flash_stm32_get_rdp_level(const struct device *dev) uint8_t flash_stm32_get_rdp_level(const struct device *dev)
{ {