alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'fix/spi_polling_api_buslock_logic_v4.3' into 'release/v4.3'

Browse Source 
fix(spi_master): polling_transmit forgot release bus lock when alloc DMA buffer failed (v4.3)

See merge request espressif/esp-idf!26135
This commit is contained in:
Jiang Jiang Jian 2023-10-12 10:13:08 +08:00
commit 784a688aa9
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/driver/include/driver/spi_master.h
View File

@ -305,6 +305,9 @@ esp_err_t spi_device_polling_end(spi_device_handle_t handle, TickType_t ticks_to
* @param trans_desc Description of transaction to execute * @param trans_desc Description of transaction to execute
* @return * @return
* - ESP_ERR_INVALID_ARG if parameter is invalid * - ESP_ERR_INVALID_ARG if parameter is invalid
* - ESP_ERR_TIMEOUT if the device cannot get control of the bus
* - ESP_ERR_NO_MEM if allocating DMA-capable temporary buffer failed
* - ESP_ERR_INVALID_STATE if previous transactions of same device are not finished
* - ESP_OK on success * - ESP_OK on success
*/ */
esp_err_t spi_device_polling_transmit(spi_device_handle_t handle, spi_transaction_t *trans_desc); esp_err_t spi_device_polling_transmit(spi_device_handle_t handle, spi_transaction_t *trans_desc);

35
components/driver/spi_master.c
View File

@ -1,16 +1,8 @@
// Copyright 2015-2020 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
/* /*
Architecture: Architecture:
@ -936,22 +928,29 @@ esp_err_t SPI_MASTER_ISR_ATTR spi_device_polling_start(spi_device_handle_t handl
if (ret!=ESP_OK) return ret; if (ret!=ESP_OK) return ret;
SPI_CHECK(!spi_bus_device_is_polling(handle), "Cannot send polling transaction while the previous polling transaction is not terminated.", ESP_ERR_INVALID_STATE ); SPI_CHECK(!spi_bus_device_is_polling(handle), "Cannot send polling transaction while the previous polling transaction is not terminated.", ESP_ERR_INVALID_STATE );
spi_host_t *host = handle->host;
spi_trans_priv_t priv_polling_trans;
ret = setup_priv_desc(trans_desc, &priv_polling_trans, (host->bus_attr->dma_enabled));
if (ret!=ESP_OK) return ret;
/* If device_acquiring_lock is set to handle, it means that the user has already /* If device_acquiring_lock is set to handle, it means that the user has already
* acquired the bus thanks to the function `spi_device_acquire_bus()`. * acquired the bus thanks to the function `spi_device_acquire_bus()`.
* In that case, we don't need to take the lock again. */ * In that case, we don't need to take the lock again. */
spi_host_t *host = handle->host;
if (host->device_acquiring_lock != handle) { if (host->device_acquiring_lock != handle) {
ret = spi_bus_lock_acquire_start(handle->dev_lock, ticks_to_wait); ret = spi_bus_lock_acquire_start(handle->dev_lock, ticks_to_wait);
} else { } else {
ret = spi_bus_lock_wait_bg_done(handle->dev_lock, ticks_to_wait); ret = spi_bus_lock_wait_bg_done(handle->dev_lock, ticks_to_wait);
} }
if (ret != ESP_OK) return ret; if (ret != ESP_OK) {
uninstall_priv_desc(&priv_polling_trans);
ret = setup_priv_desc(trans_desc, &host->cur_trans_buf, (host->bus_attr->dma_enabled)); ESP_LOGE(SPI_TAG, "polling can't get buslock");
if (ret!=ESP_OK) return ret; return ret;
}
//After holding the buslock, common resource can be accessed !!
//Polling, no interrupt is used. //Polling, no interrupt is used.
host->polling = true; host->polling = true;
host->cur_trans_buf = priv_polling_trans;
ESP_LOGV(SPI_TAG, "polling trans"); ESP_LOGV(SPI_TAG, "polling trans");
spi_new_trans(handle, &host->cur_trans_buf); spi_new_trans(handle, &host->cur_trans_buf);