Modified dma pointer callback implementation. hw ptr calculated based on System Memory to ACP SRAM dma channel transfer count in case of playback. In case of capture, hw ptr calculated based on dma transfer count for ACP SRAM to System Memory Dma channel. Added IOC Bit for Sysmem to ACP Dma channel for both controller instances. Invoked snd_pcm_period_elapsed() call when IOC is reported for System memory to ACP SRAM DMA channel.
Signed-off-by: Vijendar Mukunda Vijendar.Mukunda@amd.com Signed-off-by: Akshu Agrawal akshu.agrawal@amd.com --- v1->v2: removed hard coded values in acp dma pointer callback declared dma varaibles in rtd structure. v2->v3: modified code to invoke snd_pcm_period_elapsed() call when IOC reported for System Memory to ACP SRAM dma channel. This patch is dependent on [V4,10/10] ASoC: amd: dma driver changes for bt i2s instance https://patchwork.kernel.org/patch/10385381/
sound/soc/amd/acp-pcm-dma.c | 85 +++++++++++++++++++++++---------------------- sound/soc/amd/acp.h | 15 +++----- 2 files changed, 48 insertions(+), 52 deletions(-)
diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c index 906eb77..dfb37b5 100644 --- a/sound/soc/amd/acp-pcm-dma.c +++ b/sound/soc/amd/acp-pcm-dma.c @@ -207,11 +207,13 @@ static void set_acp_sysmem_dma_descriptors(void __iomem *acp_mmio, switch (asic_type) { case CHIP_STONEY: dmadscr[i].xfer_val |= + BIT(22) | (ACP_DMA_ATTR_DAGB_GARLIC_TO_SHAREDMEM << 16) | (size / 2); break; default: dmadscr[i].xfer_val |= + BIT(22) | (ACP_DMA_ATTR_DAGB_ONION_TO_SHAREDMEM << 16) | (size / 2); } @@ -356,9 +358,11 @@ static void acp_dma_start(void __iomem *acp_mmio, dma_ctrl |= ACP_DMA_CNTL_0__DMAChRun_MASK;
switch (ch_num) { + case SYSRAM_TO_ACP_CH_NUM: case ACP_TO_I2S_DMA_CH_NUM: case ACP_TO_SYSRAM_CH_NUM: case I2S_TO_ACP_DMA_CH_NUM: + case SYSRAM_TO_ACP_BT_INSTANCE_CH_NUM: case ACP_TO_I2S_DMA_BT_INSTANCE_CH_NUM: case ACP_TO_SYSRAM_BT_INSTANCE_CH_NUM: case I2S_TO_ACP_DMA_BT_INSTANCE_CH_NUM: @@ -642,10 +646,14 @@ static irqreturn_t dma_irq_handler(int irq, void *arg) config_acp_dma_channel(acp_mmio, SYSRAM_TO_ACP_CH_NUM, dscr_idx, 1, 0); acp_dma_start(acp_mmio, SYSRAM_TO_ACP_CH_NUM, false); + acp_reg_write((intr_flag & BIT(ACP_TO_I2S_DMA_CH_NUM)) << 16, + acp_mmio, mmACP_EXTERNAL_INTR_STAT); + }
+ if ((intr_flag & BIT(SYSRAM_TO_ACP_CH_NUM)) != 0) { + valid_irq = true; snd_pcm_period_elapsed(irq_data->play_i2ssp_stream); - - acp_reg_write((intr_flag & BIT(ACP_TO_I2S_DMA_CH_NUM)) << 16, + acp_reg_write((intr_flag & BIT(SYSRAM_TO_ACP_CH_NUM)) << 16, acp_mmio, mmACP_EXTERNAL_INTR_STAT); }
@@ -661,12 +669,19 @@ static irqreturn_t dma_irq_handler(int irq, void *arg) dscr_idx, 1, 0); acp_dma_start(acp_mmio, SYSRAM_TO_ACP_BT_INSTANCE_CH_NUM, false); - snd_pcm_period_elapsed(irq_data->play_i2sbt_stream); acp_reg_write((intr_flag & BIT(ACP_TO_I2S_DMA_BT_INSTANCE_CH_NUM)) << 16, acp_mmio, mmACP_EXTERNAL_INTR_STAT); }
+ if ((intr_flag & BIT(SYSRAM_TO_ACP_BT_INSTANCE_CH_NUM)) != 0) { + valid_irq = true; + snd_pcm_period_elapsed(irq_data->play_i2sbt_stream); + acp_reg_write((intr_flag & + BIT(SYSRAM_TO_ACP_BT_INSTANCE_CH_NUM)) << 16, + acp_mmio, mmACP_EXTERNAL_INTR_STAT); + } + if ((intr_flag & BIT(I2S_TO_ACP_DMA_CH_NUM)) != 0) { valid_irq = true; if (acp_reg_read(acp_mmio, mmACP_DMA_CUR_DSCR_15) == @@ -854,10 +869,9 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream, rtd->destination = TO_BLUETOOTH; rtd->dma_dscr_idx_1 = PLAYBACK_START_DMA_DESCR_CH8; rtd->dma_dscr_idx_2 = PLAYBACK_START_DMA_DESCR_CH9; - rtd->byte_cnt_high_reg_offset = - mmACP_I2S_BT_TRANSMIT_BYTE_CNT_HIGH; - rtd->byte_cnt_low_reg_offset = - mmACP_I2S_BT_TRANSMIT_BYTE_CNT_LOW; + rtd->dma_curr_dscr = mmACP_DMA_CUR_DSCR_8; + rtd->cur_trans_cnt = mmACP_DMA_CUR_TRANS_CNT_8; + rtd->end_dma_dscr = PLAYBACK_END_DMA_DESCR_CH8; adata->play_i2sbt_stream = substream; break; case I2S_SP_INSTANCE: @@ -875,10 +889,9 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream, rtd->destination = TO_ACP_I2S_1; rtd->dma_dscr_idx_1 = PLAYBACK_START_DMA_DESCR_CH12; rtd->dma_dscr_idx_2 = PLAYBACK_START_DMA_DESCR_CH13; - rtd->byte_cnt_high_reg_offset = - mmACP_I2S_TRANSMIT_BYTE_CNT_HIGH; - rtd->byte_cnt_low_reg_offset = - mmACP_I2S_TRANSMIT_BYTE_CNT_LOW; + rtd->dma_curr_dscr = mmACP_DMA_CUR_DSCR_12; + rtd->cur_trans_cnt = mmACP_DMA_CUR_TRANS_CNT_12; + rtd->end_dma_dscr = PLAYBACK_END_DMA_DESCR_CH12; adata->play_i2ssp_stream = substream; } } else { @@ -891,10 +904,10 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream, rtd->destination = FROM_BLUETOOTH; rtd->dma_dscr_idx_1 = CAPTURE_START_DMA_DESCR_CH10; rtd->dma_dscr_idx_2 = CAPTURE_START_DMA_DESCR_CH11; - rtd->byte_cnt_high_reg_offset = - mmACP_I2S_BT_RECEIVE_BYTE_CNT_HIGH; - rtd->byte_cnt_low_reg_offset = - mmACP_I2S_BT_RECEIVE_BYTE_CNT_LOW; + rtd->dma_cntl = mmACP_DMA_CNTL_10; + rtd->dma_curr_dscr = mmACP_DMA_CUR_DSCR_10; + rtd->cur_trans_cnt = mmACP_DMA_CUR_TRANS_CNT_10; + rtd->end_dma_dscr = CAPTURE_END_DMA_DESCR_CH10; adata->capture_i2sbt_stream = substream; break; case I2S_SP_INSTANCE: @@ -914,10 +927,10 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream, rtd->destination = FROM_ACP_I2S_1; rtd->dma_dscr_idx_1 = CAPTURE_START_DMA_DESCR_CH14; rtd->dma_dscr_idx_2 = CAPTURE_START_DMA_DESCR_CH15; - rtd->byte_cnt_high_reg_offset = - mmACP_I2S_RECEIVED_BYTE_CNT_HIGH; - rtd->byte_cnt_low_reg_offset = - mmACP_I2S_RECEIVED_BYTE_CNT_LOW; + rtd->dma_cntl = mmACP_DMA_CNTL_14; + rtd->dma_curr_dscr = mmACP_DMA_CUR_DSCR_14; + rtd->cur_trans_cnt = mmACP_DMA_CUR_TRANS_CNT_14; + rtd->end_dma_dscr = CAPTURE_END_DMA_DESCR_CH14; adata->capture_i2ssp_stream = substream; } } @@ -955,22 +968,13 @@ static int acp_dma_hw_free(struct snd_pcm_substream *substream) return snd_pcm_lib_free_pages(substream); }
-static u64 acp_get_byte_count(struct audio_substream_data *rtd) -{ - union acp_dma_count byte_count; - - byte_count.bcount.high = acp_reg_read(rtd->acp_mmio, - rtd->byte_cnt_high_reg_offset); - byte_count.bcount.low = acp_reg_read(rtd->acp_mmio, - rtd->byte_cnt_low_reg_offset); - return byte_count.bytescount; -} - static snd_pcm_uframes_t acp_dma_pointer(struct snd_pcm_substream *substream) { u32 buffersize; u32 pos = 0; - u64 bytescount = 0; + u32 dma_count = 0; + u16 dscr; + u32 period_bytes;
struct snd_pcm_runtime *runtime = substream->runtime; struct audio_substream_data *rtd = runtime->private_data; @@ -979,11 +983,15 @@ static snd_pcm_uframes_t acp_dma_pointer(struct snd_pcm_substream *substream) return -EINVAL;
buffersize = frames_to_bytes(runtime, runtime->buffer_size); - bytescount = acp_get_byte_count(rtd); - - if (bytescount > rtd->bytescount) - bytescount -= rtd->bytescount; - pos = do_div(bytescount, buffersize); + period_bytes = frames_to_bytes(runtime, runtime->period_size); + if ((substream->stream == SNDRV_PCM_STREAM_CAPTURE) && + acp_reg_read(rtd->acp_mmio, rtd->dma_cntl) == 0) + return 0; + dscr = acp_reg_read(rtd->acp_mmio, rtd->dma_curr_dscr); + dma_count = acp_reg_read(rtd->acp_mmio, rtd->cur_trans_cnt); + if (dscr == rtd->end_dma_dscr) + dma_count += period_bytes; + pos = dma_count % buffersize; return bytes_to_frames(runtime, pos); }
@@ -1016,7 +1024,6 @@ static int acp_dma_trigger(struct snd_pcm_substream *substream, int cmd) { int ret; u32 loops = 4000; - u64 bytescount = 0;
struct snd_pcm_runtime *runtime = substream->runtime; struct snd_soc_pcm_runtime *prtd = substream->private_data; @@ -1030,9 +1037,6 @@ static int acp_dma_trigger(struct snd_pcm_substream *substream, int cmd) case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: case SNDRV_PCM_TRIGGER_RESUME: - bytescount = acp_get_byte_count(rtd); - if (rtd->bytescount == 0) - rtd->bytescount = bytescount; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { acp_dma_start(rtd->acp_mmio, rtd->ch1, false); while (acp_reg_read(rtd->acp_mmio, mmACP_DMA_CH_STS) & @@ -1066,7 +1070,6 @@ static int acp_dma_trigger(struct snd_pcm_substream *substream, int cmd) acp_dma_stop(rtd->acp_mmio, rtd->ch2); ret = acp_dma_stop(rtd->acp_mmio, rtd->ch1); } - rtd->bytescount = 0; break; default: ret = -EINVAL; diff --git a/sound/soc/amd/acp.h b/sound/soc/amd/acp.h index 9cd3e96..4740804 100644 --- a/sound/soc/amd/acp.h +++ b/sound/soc/amd/acp.h @@ -131,12 +131,13 @@ struct audio_substream_data { u16 destination; u16 dma_dscr_idx_1; u16 dma_dscr_idx_2; + u16 end_dma_dscr; u32 pte_offset; u32 sram_bank; - u32 byte_cnt_high_reg_offset; - u32 byte_cnt_low_reg_offset; + u32 dma_cntl; + u32 dma_curr_dscr; + u32 cur_trans_cnt; uint64_t size; - u64 bytescount; void __iomem *acp_mmio; };
@@ -157,14 +158,6 @@ struct acp_platform_info { u16 i2s_instance; };
-union acp_dma_count { - struct { - u32 low; - u32 high; - } bcount; - u64 bytescount; -}; - enum { ACP_TILE_P1 = 0, ACP_TILE_P2,