LailaTheElf/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix SPI bus lock issue in spi_start_extended when using mutual exclusion (#25447)

Browse Source
This commit is contained in:
Copilot 2025-07-06 07:20:48 +01:00 committed by GitHub
parent da7811f82a
commit 90b5c17034
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
platforms/chibios/drivers/spi_master.c
View File

@ -130,10 +130,16 @@ bool spi_start_extended(spi_start_config_t *start_config) {
#endif // (SPI_USE_MUTUAL_EXCLUSION == TRUE) #endif // (SPI_USE_MUTUAL_EXCLUSION == TRUE)
if (spiStarted) { if (spiStarted) {
#if (SPI_USE_MUTUAL_EXCLUSION == TRUE)
spiReleaseBus(&SPI_DRIVER);
#endif // (SPI_USE_MUTUAL_EXCLUSION == TRUE)
return false; return false;
} }
#if SPI_SELECT_MODE != SPI_SELECT_MODE_NONE #if SPI_SELECT_MODE != SPI_SELECT_MODE_NONE
if (start_config->slave_pin == NO_PIN) { if (start_config->slave_pin == NO_PIN) {
# if (SPI_USE_MUTUAL_EXCLUSION == TRUE)
spiReleaseBus(&SPI_DRIVER);
# endif // (SPI_USE_MUTUAL_EXCLUSION == TRUE)
return false; return false;
} }
#endif #endif
@ -146,10 +152,16 @@ bool spi_start_extended(spi_start_config_t *start_config) {
# if defined(AT32F415) # if defined(AT32F415)
if (roundedDivisor < 2 || roundedDivisor > 1024) { if (roundedDivisor < 2 || roundedDivisor > 1024) {
# if (SPI_USE_MUTUAL_EXCLUSION == TRUE)
spiReleaseBus(&SPI_DRIVER);
# endif // (SPI_USE_MUTUAL_EXCLUSION == TRUE)
return false; return false;
} }
# else # else
if (roundedDivisor < 2 || roundedDivisor > 256) { if (roundedDivisor < 2 || roundedDivisor > 256) {
# if (SPI_USE_MUTUAL_EXCLUSION == TRUE)
spiReleaseBus(&SPI_DRIVER);
# endif // (SPI_USE_MUTUAL_EXCLUSION == TRUE)
return false; return false;
} }
# endif # endif
@ -234,6 +246,9 @@ bool spi_start_extended(spi_start_config_t *start_config) {
} }
if (start_config->divisor < 1) { if (start_config->divisor < 1) {
# if (SPI_USE_MUTUAL_EXCLUSION == TRUE)
spiReleaseBus(&SPI_DRIVER);
# endif // (SPI_USE_MUTUAL_EXCLUSION == TRUE)
return false; return false;
} }