Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-01 18:50:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/spi_buslock_unregister_issue_v6.1' into 'release/v6.1'

Browse Source 
fix(hw_support): spi buslock fix unregister dev api issue (v6.1)

See merge request espressif/esp-idf!51472
This commit is contained in:
morris
2026-08-27 18:00:35 +08:00
parent 5cb807164b 6431436b03
commit 5224318d78
8 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_driver_spi/src/gpspi/spi_master.c
+2 -1
View File
@@ -596,6 +596,7 @@ esp_err_t spi_bus_remove_device(spi_device_handle_t handle)
//catch design errors and aren't meant to be triggered during normal operation.
SPI_CHECK(uxQueueMessagesWaiting(handle->trans_queue) == 0, "Have unfinished transactions", ESP_ERR_INVALID_STATE);
SPI_CHECK(handle->host->cur_cs == DEV_NUM_MAX || handle->host->device[handle->host->cur_cs] != handle, "Have unfinished transactions", ESP_ERR_INVALID_STATE);
SPI_CHECK(handle->host->device_acquiring_lock != handle, "Device has acquired the bus", ESP_ERR_INVALID_STATE);
if (handle->ret_queue) {
SPI_CHECK(uxQueueMessagesWaiting(handle->ret_queue) == 0, "Have unfinished transactions", ESP_ERR_INVALID_STATE);
}
@@ -1164,7 +1165,7 @@ static SPI_MASTER_ISR_ATTR void uninstall_priv_desc(spi_trans_priv_t* trans_buf)
// copy data from temporary DMA-capable buffer back to trans_desc buffer and free the temporary one.
void *orig_rx_buffer = (trans_desc->flags & SPI_TRANS_USE_RXDATA) ? trans_desc->rx_data : trans_desc->rx_buffer;
if (trans_buf->buffer_to_rcv != orig_rx_buffer) {
if (trans_buf->buffer_to_rcv && trans_buf->buffer_to_rcv != orig_rx_buffer) {
memcpy(orig_rx_buffer, trans_buf->buffer_to_rcv, (trans_desc->rxlength + 7) / 8);
free(trans_buf->buffer_to_rcv);
}
components/esp_driver_spi/src/gpspi/spi_slave.c
+1 -1
View File
@@ -413,7 +413,7 @@ static void SPI_SLAVE_ISR_ATTR spi_slave_uninstall_priv_trans(spi_host_device_t
if (trans->tx_buffer && (trans->tx_buffer != priv_trans->tx_buffer)) {
free(priv_trans->tx_buffer);
}
if (trans->rx_buffer && (trans->rx_buffer != priv_trans->rx_buffer)) {
if (priv_trans->rx_buffer && (trans->rx_buffer != priv_trans->rx_buffer)) {
size_t compatible_len = trans->rx_length ? trans->rx_length : trans->length;
memcpy(trans->rx_buffer, priv_trans->rx_buffer, (MIN(compatible_len, trans->trans_len) + 7) / 8);
free(priv_trans->rx_buffer);
components/esp_driver_spi/src/gpspi/spi_slave_hd.c
+2 -2
View File
@@ -701,7 +701,7 @@ static SPI_SLAVE_ISR_ATTR void s_spi_slave_hd_append_legacy_isr(void *arg)
static void s_spi_slave_hd_destroy_priv_trans(spi_host_device_t host, spi_slave_hd_trans_priv_t *priv_trans, spi_slave_chan_t chan)
{
spi_slave_hd_data_t *orig_trans = priv_trans->trans;
if (priv_trans->aligned_buffer != orig_trans->data) {
if (priv_trans->aligned_buffer && priv_trans->aligned_buffer != orig_trans->data) {
if (chan == SPI_SLAVE_CHAN_RX) {
memcpy(orig_trans->data, priv_trans->aligned_buffer, orig_trans->trans_len);
}
@@ -795,7 +795,7 @@ esp_err_t s_spi_slave_hd_append_rxdma(spi_slave_hd_slot_t *host, uint8_t *data,
return ESP_ERR_INVALID_STATE;
}
spicommon_dma_desc_setup_link(hal->rx_cur_desc->desc, data, len, false);
spicommon_dma_desc_setup_link(hal->rx_cur_desc->desc, data, len, true);
hal->rx_cur_desc->arg = arg;
if (!hal->rx_used_desc_cnt) {
components/esp_hw_support/spi_bus_lock.c
+11
View File
@@ -705,10 +705,16 @@ void spi_bus_lock_unregister_dev(spi_bus_lock_dev_handle_t dev_handle)
spi_bus_lock_t* lock = dev_handle->parent;
BUS_LOCK_DEBUG_EXECUTE_CHECK(atomic_load(&lock->dev[id]) == (intptr_t)dev_handle);
BUS_LOCK_DEBUG_EXECUTE_CHECK(lock->acquiring_dev != dev_handle);
BUS_LOCK_DEBUG_EXECUTE_CHECK((lock_status_fetch(lock) & dev_handle->mask) == 0);
if (lock->last_dev == dev_handle) {
lock->last_dev = NULL;
}
if (lock->acquiring_dev == dev_handle) {
lock->acquiring_dev = NULL;
lock->acq_dev_bg_active = false;
}
atomic_store(&lock->dev[id], (intptr_t)NULL);
if (dev_handle->semphr) {
@@ -735,6 +741,11 @@ void spi_bus_lock_set_bg_control(spi_bus_lock_handle_t lock, bg_ctrl_func_t bg_e
lock->bg_arg = arg;
}
IRAM_ATTR spi_bus_lock_handle_t spi_bus_lock_get_parent(spi_bus_lock_dev_handle_t dev_handle)
{
return (dev_handle ? dev_handle->parent : NULL);
}
IRAM_ATTR int spi_bus_lock_get_dev_id(spi_bus_lock_dev_handle_t dev_handle)
{
return (dev_handle ? dev_lock_get_id(dev_handle) : -1);
components/spi_flash/esp_flash_spi_init.c
+7 -3
View File
@@ -439,17 +439,21 @@ esp_err_t spi_bus_remove_flash_device(esp_flash_t *chip)
return ESP_ERR_INVALID_ARG;
}
spi_bus_lock_dev_handle_t dev_handle = NULL;
esp_err_t ret = esp_flash_deinit_os_functions(chip, &dev_handle);
if (ret != ESP_OK) {
return ret;
}
// Disable GPSPI clocks before cleanup
deinit_gpspi_clock(chip);
spi_bus_lock_dev_handle_t dev_handle = NULL;
esp_flash_deinit_os_functions(chip, &dev_handle);
if (dev_handle) {
spi_bus_lock_unregister_dev(dev_handle);
}
free(chip->host);
free(chip);
return ESP_OK;
return ret;
}
/* The default (ie initial boot) no-OS ROM esp_flash_os_functions_t */
components/spi_flash/include/esp_flash_spi_init.h
+1
View File
@@ -51,6 +51,7 @@ esp_err_t spi_bus_add_flash_device(esp_flash_t **out_chip, const esp_flash_spi_d
*
* @return
* - ESP_ERR_INVALID_ARG: The chip is invalid.
* - ESP_ERR_INVALID_STATE: The chip is still acquiring the SPI bus lock.
* - ESP_OK: success.
*/
esp_err_t spi_bus_remove_flash_device(esp_flash_t *chip);
components/spi_flash/include/esp_private/esp_flash_internal.h
+3 -1
View File
@@ -70,7 +70,9 @@ esp_err_t esp_flash_init_os_functions(esp_flash_t *chip, int host_id, spi_bus_lo
* @param chip The chip to deinit os functions
* @param out_dev_handle The SPI bus lock passed from `esp_flash_init_os_functions`. The caller should deinitialize
* the lock.
* @return always ESP_OK.
* @return
* - ESP_ERR_INVALID_STATE: the chip is still acquiring the SPI bus lock.
* - ESP_OK: success.
*/
esp_err_t esp_flash_deinit_os_functions(esp_flash_t* chip, spi_bus_lock_dev_handle_t* out_dev_handle);
components/spi_flash/spi_flash_os_func_app.c
+7 -1
View File
@@ -488,9 +488,15 @@ esp_err_t esp_flash_init_os_functions(esp_flash_t *chip, int host_id, spi_bus_lo
esp_err_t esp_flash_deinit_os_functions(esp_flash_t* chip, spi_bus_lock_dev_handle_t* out_dev_handle)
{
*out_dev_handle = NULL;
if (chip->os_func_data) {
app_func_arg_t *ctx = (app_func_arg_t*)chip->os_func_data;
spi_bus_lock_dev_handle_t dev_handle = ctx->dev_lock;
if (dev_handle && spi_bus_lock_get_acquiring_dev(spi_bus_lock_get_parent(dev_handle)) == dev_handle) {
return ESP_ERR_INVALID_STATE;
}
// SPI bus lock is possibly not used on SPI1 bus
*out_dev_handle = ((app_func_arg_t*)chip->os_func_data)->dev_lock;
*out_dev_handle = dev_handle;
free(chip->os_func_data);
}
chip->os_func = NULL;