UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-28 18:20:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ion] Fix memory-mapped read after indirect operation on external flash

Browse Source 
Workaround from ST's Errata sheet ES0360 Rev 3
This commit is contained in:
Léa Saviot
2019-03-25 10:56:25 +01:00
parent 992222e163
commit 8a7adc9377
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ion/src/device/shared/drivers/external_flash.cpp
View File

@@ -178,6 +178,22 @@ static void unset_memory_mapped_mode() {
}
static void send_command_full(QUADSPI::CCR::FunctionalMode functionalMode, QUADSPI::CCR::OperatingMode operatingMode, Command c, uint8_t * address, uint32_t altBytes, size_t numberOfAltBytes, uint8_t dummyCycles, uint8_t * data, size_t dataLength) {
/* According to ST's Errata Sheet ES0360, "Wrong data can be read in
* memory-mapped after an indirect mode operation". This is the workaround. */
if (functionalMode == QUADSPI::CCR::FunctionalMode::MemoryMapped) {
QUADSPI::CCR::FunctionalMode previousMode = QUADSPI.CCR()->getFMODE();
if (previousMode == QUADSPI::CCR::FunctionalMode::IndirectWrite || previousMode == QUADSPI::CCR::FunctionalMode::IndirectRead) {
// Reset the address register
QUADSPI.AR()->set(0); // No write to DR should be done after this
if (previousMode == QUADSPI::CCR::FunctionalMode::IndirectRead) {
// Make an abort request to stop the reading and clear the busy bit
QUADSPI.CR()->setABORT(true);
while (QUADSPI.CR()->getABORT()) {
}
}
}
}
class QUADSPI::CCR ccr(0);
ccr.setFMODE(functionalMode);
if (data != nullptr || functionalMode == QUADSPI::CCR::FunctionalMode::MemoryMapped) {

1
ion/src/device/shared/regs/quadspi.h
View File

@@ -16,6 +16,7 @@ public:
public:
using Register32::Register32;
REGS_BOOL_FIELD(EN, 0);
REGS_BOOL_FIELD(ABORT, 1);
REGS_BOOL_FIELD(TCEN, 3); // Lower-power timeout counter enable in memory-mapped mode
REGS_BOOL_FIELD(SSHIFT, 4);
REGS_FIELD(PRESCALER, uint8_t, 31, 24);