Skip to content

nRF QSPI flash driver refactor #376

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
merged 6 commits into from
Oct 27, 2025
+451 −585
Merged

nRF QSPI flash driver refactor #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3164961
fw/drivers/nrf5/qspi: refactor driver
gmarull Oct 17, 2025
974264c
third_party/hal_nordic: disable QSPI nrfx driver
gmarull Oct 17, 2025
0ca62c6
fw/console: add 128/512 sizes to flash benchmark
gmarull Oct 17, 2025
d07a1d1
fw/drivers/flash/api: disable stop mode when reading
gmarull Oct 24, 2025
8282732
fw/drivers/nrf5/qspi: enable/disable QSPI when entering LP mode
gmarull Oct 27, 2025
e89e5b5
fw/boards/asterix: re-enable stop mode
gmarull Oct 17, 2025
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
8 changes: 1 addition & 7 deletions src/fw/board/boards/board_asterix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
static QSPIPortState s_qspi_port_state;
static QSPIPort QSPI_PORT = {
.state = &s_qspi_port_state,
.auto_polling_interval = 16,
.clk_freq_hz = 8000000UL,
.cs_gpio = NRF_GPIO_PIN_MAP(0, 17),
.clk_gpio = NRF_GPIO_PIN_MAP(0, 19),
.data_gpio =
Expand All @@ -48,13 +48,10 @@ static QSPIFlashState s_qspi_flash_state;
static QSPIFlash QSPI_FLASH_DEVICE = {
.state = &s_qspi_flash_state,
.qspi = &QSPI_PORT,
.default_fast_read_ddr_enabled = false,
.read_mode = QSPI_FLASH_READ_READ4IO,
.write_mode = QSPI_FLASH_WRITE_PP4O,
.reset_gpio = {GPIO_Port_NULL},
};
QSPIFlash *const QSPI_FLASH = &QSPI_FLASH_DEVICE;
IRQ_MAP_NRFX(QSPI, nrfx_qspi_irq_handler);
/* PERIPHERAL ID 43 */

static UARTDeviceState s_dbg_uart_state;
Expand Down Expand Up @@ -242,7 +239,4 @@ void board_init(void) {
i2c_use(I2C_DA7212);
i2c_write_block(I2C_DA7212, 2, da7212_powerdown);
i2c_release(I2C_DA7212);

// XXX: FIRM-264: stop mode breaks NimBLE
stop_mode_disable(InhibitorMain);
}
2 changes: 2 additions & 0 deletions src/fw/console/prompt_commands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,9 @@ void command_flash_benchmark() {
s_flash_benchmark(5);
s_flash_benchmark(16);
s_flash_benchmark(64);
s_flash_benchmark(128);
s_flash_benchmark(256);
s_flash_benchmark(512);
Comment on lines +657 to +659
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what are the results for the refactor? :)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see updated comment

s_flash_benchmark(1024);
}

Expand Down
2 changes: 2 additions & 0 deletions src/fw/drivers/flash/flash_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,9 @@ void flash_read_bytes(uint8_t* buffer, uint32_t start_addr,
if (s_erase.suspended) {
new_timer_start(s_erase_suspend_timer, 5, prv_erase_suspend_timer_cb, NULL, 0);
}
stop_mode_disable(InhibitorFlash);
flash_impl_read_sync(buffer, start_addr, buffer_size);
stop_mode_enable(InhibitorFlash);
mutex_unlock(s_flash_lock);
}

Expand Down
Loading
Loading