Mihit/qmk_firmware
1
0
Fork 0
forked from Github/qmk_firmware
Code Pull Requests 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
1 changed files with 15 additions and 0 deletions
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)
if (spiStarted) {
#if (SPI_USE_MUTUAL_EXCLUSION == TRUE)
spiReleaseBus(&SPI_DRIVER);
#endif // (SPI_USE_MUTUAL_EXCLUSION == TRUE)
return false;
}
#if SPI_SELECT_MODE != SPI_SELECT_MODE_NONE
if (start_config->slave_pin == NO_PIN) {
# if (SPI_USE_MUTUAL_EXCLUSION == TRUE)
spiReleaseBus(&SPI_DRIVER);
# endif // (SPI_USE_MUTUAL_EXCLUSION == TRUE)
return false;
}
#endif
@@ -146,10 +152,16 @@ bool spi_start_extended(spi_start_config_t *start_config) {
# if defined(AT32F415)
if (roundedDivisor < 2 || roundedDivisor > 1024) {
# if (SPI_USE_MUTUAL_EXCLUSION == TRUE)
spiReleaseBus(&SPI_DRIVER);
# endif // (SPI_USE_MUTUAL_EXCLUSION == TRUE)
return false;
}
# else
if (roundedDivisor < 2 || roundedDivisor > 256) {
# if (SPI_USE_MUTUAL_EXCLUSION == TRUE)
spiReleaseBus(&SPI_DRIVER);
# endif // (SPI_USE_MUTUAL_EXCLUSION == TRUE)
return false;
}
# endif
@@ -234,6 +246,9 @@ bool spi_start_extended(spi_start_config_t *start_config) {
}
if (start_config->divisor < 1) {
# if (SPI_USE_MUTUAL_EXCLUSION == TRUE)
spiReleaseBus(&SPI_DRIVER);
# endif // (SPI_USE_MUTUAL_EXCLUSION == TRUE)
return false;
}