Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix potential issue with flash write on STMF0 series #1521

Merged
merged 2 commits into from
Dec 2, 2019
Merged

Fix potential issue with flash write on STMF0 series #1521

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3360b5d
Fix issue with flash write on STMF0 series
antoniofagundes Dec 2, 2019
a4bc406
Merge branch 'develop' into antoniofagundes-patch-2
antoniofagundes Dec 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions targets/CMSIS-OS/ChibiOS/nf-overlay/os/hal/ports/STM32/LLD/FLASHv1/flash_lld.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@ int flash_lld_write(uint32_t startAddress, uint32_t length, const uint8_t* buffe
// NOTE: assuming that the supply voltage is able to cope with half-word programming
if((endAddress - cursor) >= 2)
{
// Data synchronous Barrier, forcing the CPU to respect the sequence of instruction without optimization
__DSB();

*(__IO uint16_t*)cursor = *((uint16_t*)buffer);

// update flash and buffer pointers by the 'extra' byte that was programmed
Expand All @@ -141,9 +144,11 @@ int flash_lld_write(uint32_t startAddress, uint32_t length, const uint8_t* buffe
}
else
{
// Data synchronous Barrier, forcing the CPU to respect the sequence of instruction without optimization
__DSB();

// program single byte
*(__IO uint8_t*)cursor = *buffer;

// update flash pointer by the 'extra' byte that was programmed
cursor += 2;
}
Expand All @@ -153,15 +158,15 @@ int flash_lld_write(uint32_t startAddress, uint32_t length, const uint8_t* buffe
// watchdog will quick-in if execution gets stuck
success = FLASH_WaitForLastOperation(0);

// after each program operation disable the PG Bit
CLEAR_BIT(FLASH->CR, FLASH_CR_PG);

if(!success)
{
// quit on failure
break;
}
}

// after the program operation is completed disable the PG Bit
CLEAR_BIT(FLASH->CR, FLASH_CR_PG);

// lock the FLASH
HAL_FLASH_Lock();
Expand Down Expand Up @@ -190,11 +195,6 @@ int flash_lld_isErased(uint32_t startAddress, uint32_t length)
return true;
}

uint8_t flash_lld_getSector(uint32_t address)
{
return (address - FLASH_BASE) / F0_SERIES_SECTOR_SIZE;
}

int flash_lld_erase(uint32_t address)
{
bool success = true;
Expand Down