Skip to content

Fix SDIO blocking delays and state management issues #11674

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

Open
sensei-hacker wants to merge 2 commits into
base: release/9.1
Choose a base branch
from
+8 −6
Open

Fix SDIO blocking delays and state management issues #11674

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c499f5f
fix(sdcard): remove blocking delay from SDIO retry path
sensei-hacker Jun 23, 2026
2fda3e4
fix(sdcard): fix write-path state management in SDIO driver
sensei-hacker Jun 23, 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
14 changes: 8 additions & 6 deletions src/main/drivers/sdcard/sdcard_sdio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,16 +457,15 @@ static sdcardOperationStatus_e sdcardSdio_writeBlock(uint32_t blockIndex, uint8_
sdcard.pendingOperation.callback = callback;
sdcard.pendingOperation.callbackData = callbackData;
sdcard.pendingOperation.chunkIndex = 1; // (for non-DMA transfers) we've sent chunk #0 already
sdcard.state = SDCARD_STATE_SENDING_WRITE;

if (SD_WriteBlocks_DMA(blockIndex, (uint32_t*) buffer, 512, block_count) != SD_OK) {
/* Our write was rejected! Try a few times before giving up.
* This handles transient DMA/bus issues without full card reset.
* This handles transient DMA/bus issues without a full card reset.
* Returning busy without blocking: the blackbox/asyncfatfs flush re-issues
* this operation on the next PID loop, which paces the retries for us.
*/
if (sdcard.operationRetries < SDCARD_MAX_OPERATION_RETRIES) {
sdcard.operationRetries++;
// Brief delay before retry
delay(1);
return SDCARD_OPERATION_BUSY;
}

Expand All @@ -481,6 +480,9 @@ static sdcardOperationStatus_e sdcardSdio_writeBlock(uint32_t blockIndex, uint8_
return SDCARD_OPERATION_FAILURE;
}

// DMA started successfully - only set state after confirming operation will proceed
sdcard.state = SDCARD_STATE_SENDING_WRITE;

// Success - reset retry counter
sdcard.operationRetries = 0;
return SDCARD_OPERATION_IN_PROGRESS;
Expand Down Expand Up @@ -562,11 +564,11 @@ static bool sdcardSdio_readBlock(uint32_t blockIndex, uint8_t *buffer, sdcard_op
} else {
/* Read was rejected! Try a few times before giving up.
* This handles transient DMA/bus issues without full card reset.
* Returning busy without blocking: the asyncfatfs read re-issues
* this operation on the next PID loop, which paces the retries for us.
*/
if (sdcard.operationRetries < SDCARD_MAX_OPERATION_RETRIES) {
sdcard.operationRetries++;
// Brief delay before retry
delay(1);
return false;
}

Expand Down
Loading