michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: flash: stm32g4: Fix erase on wrong bank

Browse source 
In the default configuration of the stm32g4 is the dual bank mode.
In dual bank mode, the flash is split into two banks with 256k each.
The erase pages have a range form 0 to 127, where each page has 2k.
If one wants to erase an area above 256k, the driver has to switch
to bank 2 befor erasing. Otherwise it will erase the page moulo 127.

Signed-off-by: Alexander Wachter <alexander.wacher@leica-geosystems.com>
This commit is contained in:
Alexander Wachter 2020-03-23 13:59:36 +01:00 • committed by Maureen Helm
commit 802552414c
1 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

30
drivers/flash/flash_stm32g4x.c
View file

@ -48,6 +48,7 @@ static int write_dword(struct device *dev, off_t offset, u64_t val)
/* if the control register is locked, do not fail silently */
if (regs->CR & FLASH_CR_LOCK) {
LOG_ERR("CR locked");
return -EIO;
}
@ -60,6 +61,7 @@ static int write_dword(struct device *dev, off_t offset, u64_t val)
/* Check if this double word is erased */
if (flash[0] != 0xFFFFFFFFUL ||
flash[1] != 0xFFFFFFFFUL) {
LOG_ERR("Word at offs %d not erased", offset);
return -EIO;
}
@ -90,6 +92,7 @@ static int erase_page(struct device *dev, unsigned int page)
/* if the control register is locked, do not fail silently */
if (regs->CR & FLASH_CR_LOCK) {
LOG_ERR("CR locked");
return -EIO;
}
@ -99,10 +102,29 @@ static int erase_page(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*/
regs->CR |= FLASH_CR_BKER;
page = page - 128;
LOG_DBG("Erase page %d on bank 2", page);
} else {
LOG_DBG("Erase page %d on bank 1", page);
}
__ASSERT(page <= 127, "There are only 127 pages, but page is %d", page);
#endif
/* Set the PER bit and select the page you wish to erase */
regs->CR |= FLASH_CR_PER;
regs->CR &= ~FLASH_CR_PNB_Msk;
regs->CR |= ((page % 256) << 3);
regs->CR |= (page << FLASH_CR_PNB_Pos);
/* Set the STRT bit */
regs->CR |= FLASH_CR_STRT;
@ -113,7 +135,11 @@ static int erase_page(struct device *dev, unsigned int page)
/* Wait for the BSY bit */
rc = flash_stm32_wait_flash_idle(dev);
regs->CR &= ~FLASH_CR_PER;
#ifdef FLASH_OPTR_DBANK
regs->CR &= ~(FLASH_CR_PER | FLASH_CR_BKER);
#else
regs->CR &= ~(FLASH_CR_PER);
#endif
return rc;
}