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

Unverified Commit bbdb7012 authored by Akshu Agrawal's avatar Akshu Agrawal Committed by Mark Brown
Browse files

ASoC: AMD: Make ACP->SYSMEM DMA non circular 



In capture case we don't want ACP to SYSMEM dma
to be circular. This is because if an in place DSP
filter is applied to captured output then circular DMA
can overwrite the filter value with stale data.

Signed-off-by: default avatarAkshu Agrawal <akshu.agrawal@amd.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ad0eaee6

sound/soc/amd/acp-pcm-dma.c

+31 −5
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ static void acp_dma_cap_channel_disable(void __iomem *acp_mmio, 
}



/* Start a given DMA channel transfer */

static void acp_dma_start(void __iomem *acp_mmio, u16 ch_num)

static void acp_dma_start(void __iomem *acp_mmio, u16 ch_num, bool is_circular)

{

	u32 dma_ctrl;
@@ -429,8 +429,11 @@ static void acp_dma_start(void __iomem *acp_mmio, u16 ch_num) 
		break;

	}



	/* circular for both DMA channel */

	/* enable for ACP to SRAM DMA channel */

	if (is_circular == true)

		dma_ctrl |= ACP_DMA_CNTL_0__Circular_DMA_En_MASK;

	else

		dma_ctrl &= ~ACP_DMA_CNTL_0__Circular_DMA_En_MASK;



	acp_reg_write(dma_ctrl, acp_mmio, mmACP_DMA_CNTL_0 + ch_num);

}
@@ -674,6 +677,7 @@ static int acp_deinit(void __iomem *acp_mmio) 
/* ACP DMA irq handler routine for playback, capture usecases */

static irqreturn_t dma_irq_handler(int irq, void *arg)

{

	u16 dscr_idx;

	u32 intr_flag, ext_intr_status;

	struct audio_drv_data *irq_data;

	void __iomem *acp_mmio;
@@ -705,6 +709,15 @@ static irqreturn_t dma_irq_handler(int irq, void *arg) 


	if ((intr_flag & BIT(I2S_TO_ACP_DMA_CH_NUM)) != 0) {

		valid_irq = true;

		if (acp_reg_read(acp_mmio, mmACP_DMA_CUR_DSCR_14) ==

				CAPTURE_START_DMA_DESCR_CH15)

			dscr_idx = CAPTURE_END_DMA_DESCR_CH14;

		else

			dscr_idx = CAPTURE_START_DMA_DESCR_CH14;

		config_acp_dma_channel(acp_mmio, ACP_TO_SYSRAM_CH_NUM, dscr_idx,

				       1, 0);

		acp_dma_start(acp_mmio, ACP_TO_SYSRAM_CH_NUM, false);



		snd_pcm_period_elapsed(irq_data->capture_i2ssp_stream);

		acp_reg_write((intr_flag & BIT(I2S_TO_ACP_DMA_CH_NUM)) << 16,

			      acp_mmio, mmACP_EXTERNAL_INTR_STAT);
@@ -712,6 +725,17 @@ static irqreturn_t dma_irq_handler(int irq, void *arg) 


	if ((intr_flag & BIT(I2S_TO_ACP_DMA_BT_INSTANCE_CH_NUM)) != 0) {

		valid_irq = true;

		if (acp_reg_read(acp_mmio, mmACP_DMA_CUR_DSCR_10) ==

			CAPTURE_START_DMA_DESCR_CH11)

			dscr_idx = CAPTURE_END_DMA_DESCR_CH10;

		else

			dscr_idx = CAPTURE_START_DMA_DESCR_CH10;

		config_acp_dma_channel(acp_mmio,

				       ACP_TO_SYSRAM_BT_INSTANCE_CH_NUM,

				       dscr_idx, 1, 0);

		acp_dma_start(acp_mmio, ACP_TO_SYSRAM_BT_INSTANCE_CH_NUM,

			      false);



		snd_pcm_period_elapsed(irq_data->capture_i2sbt_stream);

		acp_reg_write((intr_flag &

			      BIT(I2S_TO_ACP_DMA_BT_INSTANCE_CH_NUM)) << 16,
@@ -1053,9 +1077,11 @@ static int acp_dma_trigger(struct snd_pcm_substream *substream, int cmd) 
				acp_dma_cap_channel_enable(rtd->acp_mmio,

							   CAP_CHANNEL1);

			}

			acp_dma_start(rtd->acp_mmio, rtd->ch1, true);

		} else {

			acp_dma_start(rtd->acp_mmio, rtd->ch1, true);

			acp_dma_start(rtd->acp_mmio, rtd->ch2, true);

		}

		acp_dma_start(rtd->acp_mmio, rtd->ch1);

		acp_dma_start(rtd->acp_mmio, rtd->ch2);

		ret = 0;

		break;

	case SNDRV_PCM_TRIGGER_STOP: