Unverified Commit 2a9a72e2 authored by Cezary Rojewski's avatar Cezary Rojewski Committed by Mark Brown
Browse files

ASoC: Intel: catpt: Test dmaengine_submit() result before moving on 



After calling dmaengine_submit(), the submitted transfer descriptor
belongs to the DMA engine. Pointer to that descriptor may no longer be
valid after the call and should be tested before awaiting transfer
completion.

Reported-by: default avatarKevin Tian <kevin.tian@intel.com>
Suggested-by: default avatarDave Jiang <dave.jiang@intel.com>
Fixes: 4fac9b31 ("ASoC: Intel: Add catpt base members")
Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20211216115743.2130622-2-cezary.rojewski@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0f2ee77d

sound/soc/intel/catpt/dsp.c

+12 −2
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ static int catpt_dma_memcpy(struct catpt_dev *cdev, struct dma_chan *chan, 
{

	struct dma_async_tx_descriptor *desc;

	enum dma_status status;

	int ret;



	desc = dmaengine_prep_dma_memcpy(chan, dst_addr, src_addr, size,

					 DMA_CTRL_ACK);
@@ -77,13 +78,22 @@ static int catpt_dma_memcpy(struct catpt_dev *cdev, struct dma_chan *chan, 
	catpt_updatel_shim(cdev, HMDC,

			   CATPT_HMDC_HDDA(CATPT_DMA_DEVID, chan->chan_id),

			   CATPT_HMDC_HDDA(CATPT_DMA_DEVID, chan->chan_id));

	dmaengine_submit(desc);



	ret = dma_submit_error(dmaengine_submit(desc));

	if (ret) {

		dev_err(cdev->dev, "submit tx failed: %d\n", ret);

		goto clear_hdda;

	}



	status = dma_wait_for_async_tx(desc);

	ret = (status == DMA_COMPLETE) ? 0 : -EPROTO;



clear_hdda:

	/* regardless of status, disable access to HOST memory in demand mode */

	catpt_updatel_shim(cdev, HMDC,

			   CATPT_HMDC_HDDA(CATPT_DMA_DEVID, chan->chan_id), 0);



	return (status == DMA_COMPLETE) ? 0 : -EPROTO;

	return ret;

}



int catpt_dma_memcpy_todsp(struct catpt_dev *cdev, struct dma_chan *chan,