drivers: sdhc: sdhc_spi: release bus on error, and fix CMD12 failue logic #72754
Conversation
Properly release SPI bus on transmit error within the SDHC SPI driver. In these cases return code is not checked, as we wish to return the error code from the failed transfer to the SD stack. Fixes zephyrproject-rtos#72364 Signed-off-by: Daniel DeGrasse <[email protected]>
danieldegrasse
force-pushed
the
fix/sdhc-spi-release
branch
from
e80ffa1
to
8383861
Compare
danieldegrasse
changed the title
drivers/sdhc/sdhc_spi.c
Outdated
| (struct sdhc_command *)&stop_cmd, | ||
| false); | ||
| while ((stop_ret != 0) && (retries < 0)) { |
There was a problem hiding this comment.
Good catch, this should be retries > 0.
drivers/sdhc/sdhc_spi.c
Outdated
| ret = stop_ret = sdhc_spi_send_cmd(dev, | ||
| (struct sdhc_command *)&stop_cmd, | ||
| false); | ||
| retries--; |
There was a problem hiding this comment.
changing the same variable retries in so many places is making this code confusing to read for me
There was a problem hiding this comment.
Is there a way you'd rather structure this? As far as I know, only two locations in this function decrement the value
There was a problem hiding this comment.
i guess it's the changing and the checking, it feels like this code is doing 2 different things with one variable, there is retries for sending the stop command and retries for the request as a whole, should these be two different counts?
There was a problem hiding this comment.
Yeah I see the concern- given how we document the retries field, having a separate retry counter for this makes sense- I'll add one.
danieldegrasse
force-pushed
the
fix/sdhc-spi-release
branch
from
b54afd8
to
6459fa3
Compare
Rework CMD12 failure logic for SDHC SPI driver. Previously, the error code of CMD12 was not checked, so even if CMD12 failed to send the initial command would be retried. Change this behavior to retry CMD12 until it succeeds. If CMD12 fails, its error code will be propagated to the caller. Otherwise, the return code from the command being sent by the caller will be propagated. Fixes zephyrproject-rtos#72365 Signed-off-by: Daniel DeGrasse <[email protected]>
danieldegrasse
force-pushed
the
fix/sdhc-spi-release
branch
from
6459fa3
to
4ce25b8
Compare
Properly release SPI bus on transmit error within the SDHC SPI driver. In these cases return code is not checked, as we wish to return the error code from the failed transfer to the SD stack.
Fixes #72364
drivers: sdhc: sdhc_spi: rework CMD12 failure logic
Rework CMD12 failure logic for SDHC SPI driver. Previously, the error
code of CMD12 was not checked, so even if CMD12 failed to send the
initial command would be retried. Change this behavior to retry CMD12
until it succeeds. If CMD12 fails, its error code will be propagated to
the caller. Otherwise, the return code from the command being sent by
the caller will be propagated.
Fixes #72365