Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d1f1bf6 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown
Browse files

spi: pxa2xx: handle error of pxa2xx_spi_dma_prepare() 



If by some reason pxa2xx_spi_dma_prepare() fails we have not to ignore its
error. In such case we abort the transfer and return the error to upper
level.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
[Jarkko: Avoid leaking TX descriptors in case RX descriptor allocation
fails. Noted by Robert Jarzmik <robert.jarzmik@free.fr>.
Unmap also buffers in case of failure.]
Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f55532a0

drivers/spi/spi-pxa2xx-dma.c

+11 −2
Original line number Diff line number Diff line
@@ -267,19 +267,22 @@ irqreturn_t pxa2xx_spi_dma_transfer(struct driver_data *drv_data) 
int pxa2xx_spi_dma_prepare(struct driver_data *drv_data, u32 dma_burst)

{

	struct dma_async_tx_descriptor *tx_desc, *rx_desc;

	int err = 0;



	tx_desc = pxa2xx_spi_dma_prepare_one(drv_data, DMA_MEM_TO_DEV);

	if (!tx_desc) {

		dev_err(&drv_data->pdev->dev,

			"failed to get DMA TX descriptor\n");

		return -EBUSY;

		err = -EBUSY;

		goto err_tx;

	}



	rx_desc = pxa2xx_spi_dma_prepare_one(drv_data, DMA_DEV_TO_MEM);

	if (!rx_desc) {

		dev_err(&drv_data->pdev->dev,

			"failed to get DMA RX descriptor\n");

		return -EBUSY;

		err = -EBUSY;

		goto err_rx;

	}



	/* We are ready when RX completes */
@@ -289,6 +292,12 @@ int pxa2xx_spi_dma_prepare(struct driver_data *drv_data, u32 dma_burst) 
	dmaengine_submit(rx_desc);

	dmaengine_submit(tx_desc);

	return 0;



err_rx:

	dmaengine_terminate_async(drv_data->tx_chan);

err_tx:

	pxa2xx_spi_unmap_dma_buffers(drv_data);

	return err;

}



void pxa2xx_spi_dma_start(struct driver_data *drv_data)

drivers/spi/spi-pxa2xx.c

+7 −1
Original line number Diff line number Diff line
@@ -928,6 +928,7 @@ static void pump_transfers(unsigned long data) 
	u32 dma_thresh = drv_data->cur_chip->dma_threshold;

	u32 dma_burst = drv_data->cur_chip->dma_burst_size;

	u32 change_mask = pxa2xx_spi_get_ssrc1_change_mask(drv_data);

	int err;



	/* Get current state information */

	message = drv_data->cur_msg;
@@ -1047,7 +1048,12 @@ static void pump_transfers(unsigned long data) 
		/* Ensure we have the correct interrupt handler */

		drv_data->transfer_handler = pxa2xx_spi_dma_transfer;



		pxa2xx_spi_dma_prepare(drv_data, dma_burst);

		err = pxa2xx_spi_dma_prepare(drv_data, dma_burst);

		if (err) {

			message->status = err;

			giveback(drv_data);

			return;

		}



		/* Clear status and start DMA engine */

		cr1 = chip->cr1 | dma_thresh | drv_data->dma_cr1;