drivers/sdmmc_sdhc: add timeout to wait for ISR mutex unlock#21432
Merged
crasbe merged 2 commits intoRIOT-OS:masterfrom Jun 3, 2025
Merged
drivers/sdmmc_sdhc: add timeout to wait for ISR mutex unlock#21432crasbe merged 2 commits intoRIOT-OS:masterfrom
crasbe merged 2 commits intoRIOT-OS:masterfrom
Conversation
crasbe
reviewed
Apr 24, 2025
drivers/sdmmc/sdmmc_sdhc.c
Outdated
Comment on lines
+82
to
+83
| #define _ZTIMER_CLOCK ZTIMER_MSEC | ||
| #define _ZTIMER_TICKS_PER_MS 1 |
Contributor
There was a problem hiding this comment.
Suggested change
| #define _ZTIMER_CLOCK ZTIMER_MSEC | |
| #define _ZTIMER_TICKS_PER_MS 1 | |
| # define _ZTIMER_CLOCK ZTIMER_MSEC | |
| # define _ZTIMER_TICKS_PER_MS 1 |
drivers/sdmmc/sdmmc_sdhc.c
Outdated
Comment on lines
+86
to
+87
| #define _ZTIMER_CLOCK ZTIMER_USEC | ||
| #define _ZTIMER_TICKS_PER_MS US_PER_MS |
Contributor
There was a problem hiding this comment.
Suggested change
| #define _ZTIMER_CLOCK ZTIMER_USEC | |
| #define _ZTIMER_TICKS_PER_MS US_PER_MS | |
| # define _ZTIMER_CLOCK ZTIMER_USEC | |
| # define _ZTIMER_TICKS_PER_MS US_PER_MS |
I'm not sure if it makes sense to partially apply the indentation style now?
OR you could use the opportunity to apply it to the other #if-#else statements as well.
Ping @maribu?
Member
There was a problem hiding this comment.
I'm always happy when we add the indent. But as long as the CI does not enforce this, it is not really mandatory.
Contributor
There was a problem hiding this comment.
Contributor
|
One small thing: The title and commit message should have a slash instead of colon. So |
fabian18
changed the title
fabian18
force-pushed
the
fix/sdmmc_sdhc_irq_timeout
branch
from
48b1ae9 to
7ffe014
Compare
crasbe
added
Type: bug
crasbe
reviewed
May 14, 2025
drivers/sdmmc/sdmmc_sdhc.c
Outdated
| { | ||
| sdhc_t *sdhc = sdhc_dev->conf->sdhc; | ||
|
|
||
| DEBUG_PUTS("[sdmmc] IRQ"); |
Contributor
There was a problem hiding this comment.
This is probably a leftover from debugging, but it probably shouldn't stay.
gschorcht
reviewed
May 23, 2025
Comment on lines
+760
to
768
| if (timeout || (sdhc_dev->error & error_mask)) { | ||
| if (IS_USED(ENABLE_DEBUG)) { | ||
| if (timeout) { | ||
| DEBUG("[sdmmc] IRQ wait timeout\n"); | ||
| } | ||
| DEBUG("[sdmmc] SDHC error: EISTR=%04x, ", sdhc_dev->error); | ||
| switch (reset) { | ||
| case SDHC_SRR_SWRSTCMD: |
Contributor
There was a problem hiding this comment.
???
Suggested change
| if (timeout || (sdhc_dev->error & error_mask)) { | |
| if (IS_USED(ENABLE_DEBUG)) { | |
| if (timeout) { | |
| DEBUG("[sdmmc] IRQ wait timeout\n"); | |
| } | |
| DEBUG("[sdmmc] SDHC error: EISTR=%04x, ", sdhc_dev->error); | |
| switch (reset) { | |
| case SDHC_SRR_SWRSTCMD: | |
| if (timeout || (sdhc_dev->error & error_mask)) { | |
| if (IS_USED(ENABLE_DEBUG)) { | |
| if (timeout) { | |
| DEBUG("[sdmmc] IRQ wait timeout\n"); | |
| } | |
| else { | |
| DEBUG("[sdmmc] SDHC error: EISTR=%04x, ", sdhc_dev->error); | |
| switch (reset) { | |
| case SDHC_SRR_SWRSTCMD: | |
| ... |
Either a timeout happend or an SDHC error happened, right? If so, the DEBUG message for SDHC error shouldn't be generated in case of timeout error.
gschorcht
added
the
State: waiting for author
crasbe
removed
the
State: waiting for author
gschorcht
approved these changes
May 30, 2025
Contributor
gschorcht
left a comment
gschorcht
left a comment
There was a problem hiding this comment.
Looks good, please quash.
fabian18
force-pushed
the
fix/sdmmc_sdhc_irq_timeout
branch
from
562958b to
94286a3
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Contribution description
I witnessed situations where the sdmmc driver stalls while waiting for an IRQ.
It might be hardware though ...
However even if it is hardware, it keeps going with this changes in this PR.
Testing procedure
Internal app where data is written to an eMMC and I keep pressing ENTER to continuously execute
vfs ls.Without the change it was stalling. With this change it keeps working afterwards.
Issues/PRs references