Skip to content

Add 64KB block erase functionality to QSPI #694

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

Merged
stephenhensley merged 3 commits into from
Apr 2, 2026
Merged

Add 64KB block erase functionality to QSPI #694

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c036bb8
Add 64KB block erase functionality to QSPI
kidproquo Feb 26, 2026
7d6c050
Fix clang-format issues
kidproquo Mar 3, 2026
0323160
style fix.
stephenhensley Apr 2, 2026
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
70 changes: 63 additions & 7 deletions src/per/qspi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ class QSPIHandle::Impl

QSPIHandle::Result EraseSector(uint32_t address);

QSPIHandle::Result EraseBlock64K(uint32_t address);

uint32_t GetPin(size_t pin);

GPIO_TypeDef* GetPort(size_t pin);
Expand Down Expand Up @@ -433,22 +435,76 @@ QSPIHandle::Impl::Write(uint32_t address, uint32_t size, uint8_t* buffer)
QSPIHandle::Result QSPIHandle::Impl::Erase(uint32_t start_addr,
uint32_t end_addr)
{
uint32_t block_addr;
uint32_t block_size = IS25LP080D_SECTOR_SIZE; // 4kB blocks for now.
// 64kB chunks for now.
start_addr = start_addr - (start_addr % block_size);
uint32_t block_addr;
constexpr uint32_t BLOCK_64K = 0x10000; // 64KB
constexpr uint32_t SECTOR_4K = 0x1000; // 4KB

// Align start address down to 4KB boundary
start_addr = start_addr - (start_addr % SECTOR_4K);

while(end_addr > start_addr)
{
block_addr = start_addr & 0x0FFFFFFF;
if(EraseSector(block_addr) != QSPIHandle::Result::OK)

// Use 64KB block erase when aligned and enough space remaining
if((block_addr % BLOCK_64K) == 0
&& (end_addr - start_addr) >= BLOCK_64K)
{
ERR_RECOVERY(Status::E_HAL_ERROR);
if(EraseBlock64K(block_addr) != QSPIHandle::Result::OK)
{
ERR_RECOVERY(Status::E_HAL_ERROR);
}
start_addr += BLOCK_64K;
}
else
{
// Fall back to 4KB sector erase
if(EraseSector(block_addr) != QSPIHandle::Result::OK)
{
ERR_RECOVERY(Status::E_HAL_ERROR);
}
start_addr += SECTOR_4K;
}
start_addr += block_size;
}
return QSPIHandle::Result::OK;
}

QSPIHandle::Result QSPIHandle::Impl::EraseBlock64K(uint32_t address)
{
QSPI_CommandTypeDef s_command;
s_command.InstructionMode = QSPI_INSTRUCTION_1_LINE;
s_command.Instruction = BLOCK_ERASE_CMD; // 0xD8 = 64KB block erase
s_command.AddressMode = QSPI_ADDRESS_1_LINE;
s_command.AddressSize = QSPI_ADDRESS_24_BITS;
s_command.AlternateByteMode = QSPI_ALTERNATE_BYTES_NONE;
s_command.DataMode = QSPI_DATA_NONE;
s_command.DummyCycles = 0;
s_command.NbData = 1;
s_command.DdrMode = QSPI_DDR_MODE_DISABLE;
s_command.DdrHoldHalfCycle = QSPI_DDR_HHC_ANALOG_DELAY;
s_command.SIOOMode = QSPI_SIOO_INST_EVERY_CMD;
s_command.Address = address;

RETURN_IF_ERR(CheckProgramMemory());
RETURN_IF_ERR(SetMode(Config::Mode::INDIRECT_POLLING));

if(WriteEnable() != QSPIHandle::Result::OK)
{
ERR_RECOVERY(Status::E_HAL_ERROR);
}
if(HAL_QSPI_Command(&halqspi_, &s_command, HAL_QPSI_TIMEOUT_DEFAULT_VALUE)
!= HAL_OK)
{
ERR_RECOVERY(Status::E_HAL_ERROR);
}
if(AutopollingMemReady(HAL_QPSI_TIMEOUT_DEFAULT_VALUE)
!= QSPIHandle::Result::OK)
{
ERR_RECOVERY(Status::E_HAL_ERROR);
}

return QSPIHandle::Result::OK;
}

QSPIHandle::Result QSPIHandle::Impl::EraseSector(uint32_t address)
{
Expand Down
Loading