michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: spi_context: Use total transfer length in timeout calculation

Browse source 
When estimating the time that a given SPI transfer will take, whole
buffer sets for TX and RX need to be taken into account, not only their
first parts. Correct `spi_context_wait_for_completion()` accordingly.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This commit is contained in:
Andrzej Głąbek 2023-01-19 11:40:42 +01:00 • committed by Stephanos Ioannidis
commit f36c15e2e3
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/spi/spi_context.h
View file

@ -129,6 +129,9 @@ static inline void spi_context_release(struct spi_context *ctx, int status)
#endif /* CONFIG_SPI_ASYNC */ #endif /* CONFIG_SPI_ASYNC */
} }
static inline size_t spi_context_total_tx_len(struct spi_context *ctx);
static inline size_t spi_context_total_rx_len(struct spi_context *ctx);
static inline int spi_context_wait_for_completion(struct spi_context *ctx) static inline int spi_context_wait_for_completion(struct spi_context *ctx)
{ {
int status = 0; int status = 0;
@ -141,9 +144,11 @@ static inline int spi_context_wait_for_completion(struct spi_context *ctx)
if (IS_ENABLED(CONFIG_SPI_SLAVE) && spi_context_is_slave(ctx)) { if (IS_ENABLED(CONFIG_SPI_SLAVE) && spi_context_is_slave(ctx)) {
timeout = K_FOREVER; timeout = K_FOREVER;
} else { } else {
uint32_t tx_len = spi_context_total_tx_len(ctx);
uint32_t rx_len = spi_context_total_rx_len(ctx);
uint32_t timeout_ms; uint32_t timeout_ms;
timeout_ms = MAX(ctx->tx_len, ctx->rx_len) * 8 * 1000 / timeout_ms = MAX(tx_len, rx_len) * 8 * 1000 /
ctx->config->frequency; ctx->config->frequency;
timeout_ms += CONFIG_SPI_COMPLETION_TIMEOUT_TOLERANCE; timeout_ms += CONFIG_SPI_COMPLETION_TIMEOUT_TOLERANCE;