michaelh/zephyr
1
0
Fork 0
Code Releases Activity

spi_nxp_lpspi: Fix DMA driver async return

Browse source 
We should not release context until transfer ends. The code previously
would return from wait_for_completion and then release the context. This
is only supposed to be done in the dma callback except for the case of
error in the transceive call. For async transfer this was most likely
always happening wrong and probably broken for multi threads trying to
access the bus due to this premature release of the context.

Also we should not enable CS and leave enabled in case of error, move CS
enable to after the error check.

Signed-off-by: Declan Snyder <declan.snyder@nxp.com>
This commit is contained in:
Declan Snyder 2025-03-27 10:26:24 -05:00 • committed by Benjamin Cabé
commit 29213b5e7c
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi_dma.c
View file

@ -204,6 +204,7 @@ done:
spi_context_cs_control(ctx, false);
LPSPI_FlushFifo(base, true, true);
spi_context_complete(ctx, spi_dev, status);
spi_context_release(ctx, status);
}
static int transceive_dma(const struct device *dev, const struct spi_config *spi_cfg,
@ -224,12 +225,6 @@ static int transceive_dma(const struct device *dev, const struct spi_config *spi
spi_context_buffers_setup(ctx, tx_bufs, rx_bufs, 1);
if (!(IS_ENABLED(CONFIG_SOC_FAMILY_NXP_IMXRT) || IS_ENABLED(CONFIG_SOC_FAMILY_KINETIS))) {
base->TCR |= LPSPI_TCR_CONT_MASK;
}
spi_context_cs_control(ctx, true);
ret = spi_mcux_dma_next_fill(dev);
if (ret == -ENODATA) {
/* No transfer to do? So just exit */
@ -239,11 +234,20 @@ static int transceive_dma(const struct device *dev, const struct spi_config *spi
goto out;
}
if (!(IS_ENABLED(CONFIG_SOC_FAMILY_NXP_IMXRT) || IS_ENABLED(CONFIG_SOC_FAMILY_KINETIS))) {
base->TCR |= LPSPI_TCR_CONT_MASK;
}
spi_context_cs_control(ctx, true);
LPSPI_FlushFifo(base, true, true);
LPSPI_EnableDMA(base, kLPSPI_TxDmaEnable | kLPSPI_RxDmaEnable);
ret = spi_context_wait_for_completion(ctx);
if (ret >= 0) {
return ret;
}
out:
spi_context_release(ctx, ret);
return ret;