michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: flash: flash_stm32g4x.c: rework flash_stm32_block_erase_loop

Browse source 
Remove hardcode bank1 page limit (128) which is not always valid
(not valid for soc stm32g474rct)
Manage bank1/2 discontinuity when flash is Dualbank and
flash size is lower than 512K.

Signed-off-by: Alexandre Bourdiol <alexandre.bourdiol@st.com>
This commit is contained in:
Alexandre Bourdiol 2020-12-02 17:52:02 +01:00 • committed by Carles Cufí
commit 496e2cab3d
1 changed files with 19 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

46
drivers/flash/flash_stm32g4x.c
View file

@ -18,8 +18,6 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
#include "flash_stm32.h"
#define STM32G4X_PAGE_SHIFT 11
#define STM32G4_SERIES_MAX_FLASH 512
#define BANK2_OFFSET (KB(STM32G4_SERIES_MAX_FLASH) / 2)
@ -47,13 +45,6 @@ bool flash_stm32_valid_range(const struct device *dev, off_t offset,
flash_stm32_range_exists(dev, offset, len);
}
/*
* STM32G4xx devices can have up to 64 2K pages in a single banks
*/
static unsigned int get_page(off_t offset)
{
return offset >> STM32G4X_PAGE_SHIFT;
}
static int write_dword(const struct device *dev, off_t offset, uint64_t val)
{
@ -100,11 +91,12 @@ static int write_dword(const struct device *dev, off_t offset, uint64_t val)
return rc;
}
static int erase_page(const struct device *dev, unsigned int page)
static int erase_page(const struct device *dev, unsigned int offset)
{
FLASH_TypeDef *regs = FLASH_STM32_REGS(dev);
uint32_t tmp;
int rc;
int page;
/* if the control register is locked, do not fail silently */
if (regs->CR & FLASH_CR_LOCK) {
@ -118,23 +110,24 @@ static int erase_page(const struct device *dev, unsigned int page)
return rc;
}
#ifdef FLASH_OPTR_DBANK
if (page > 127) {
if (!(regs->OPTR & FLASH_OPTR_DBANK)) {
LOG_ERR("Page %d does not exist when DBANK=0", page);
return -EINVAL;
}
/* The pages to be erased is in bank 2*/
#if defined(FLASH_OPTR_DBANK)
if (offset < (FLASH_SIZE / 2)) {
/* The pages to be erased is in bank 1 */
regs->CR &= ~FLASH_CR_BKER_Msk;
page = offset / FLASH_PAGE_SIZE;
LOG_DBG("Erase page %d on bank 1", page);
} else if (offset >= BANK2_OFFSET) {
/* The pages to be erased is in bank 2 */
regs->CR |= FLASH_CR_BKER;
page = page - 128;
page = (offset - BANK2_OFFSET) / FLASH_PAGE_SIZE;
LOG_DBG("Erase page %d on bank 2", page);
} else {
LOG_DBG("Erase page %d on bank 1", page);
LOG_ERR("Offset %d does not exist", offset);
return -EINVAL;
}
__ASSERT(page <= 127, "There are only 127 pages, but page is %d", page);
#else
page = offset / FLASH_PAGE_SIZE;
LOG_DBG("Erase page %d", page);
#endif
/* Set the PER bit and select the page you wish to erase */
@ -164,11 +157,10 @@ int flash_stm32_block_erase_loop(const struct device *dev,
unsigned int offset,
unsigned int len)
{
int i, rc = 0;
unsigned int address = offset, rc = 0;
i = get_page(offset);
for (; i <= get_page(offset + len - 1) ; ++i) {
rc = erase_page(dev, i);
for (; address <= offset + len - 1 ; address += FLASH_PAGE_SIZE) {
rc = erase_page(dev, address);
if (rc < 0) {
break;
}